Skip to content

Commit 7fc79ef

Browse files
authored
Merge pull request #3447 from djc/no-protoc
Avoid installing protoc for most CI workflows
2 parents bd08d35 + dab4516 commit 7fc79ef

7 files changed

+1
-24
lines changed

.github/workflows/all-features.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
uses: arduino/setup-protoc@v1
3131
with:
3232
version: "3.x"
33+
repo-token: ${{ secrets.GITHUB_TOKEN }}
3334
- name: Set environment variables appropriately for the build
3435
run: |
3536
echo "$HOME/.cargo/bin" >> $GITHUB_PATH

.github/workflows/centos-fmt-clippy-on-all.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ jobs:
7272
run: |
7373
rustup component add rustfmt
7474
rustup component add clippy
75-
- name: Install Protoc
76-
uses: arduino/setup-protoc@v1
77-
with:
78-
version: '3.x'
7975
- name: Run the centos check within the docker image
8076
run: |
8177
docker run \

.github/workflows/linux-builds-on-master.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ jobs:
9898
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
9999
- name: Fetch the docker
100100
run: bash ci/fetch-rust-docker.bash "${TARGET}"
101-
- name: Install Protoc
102-
uses: arduino/setup-protoc@v1
103-
with:
104-
version: '3.x'
105101
- name: Maybe build a docker from there
106102
run: |
107103
if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then

.github/workflows/linux-builds-on-pr.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ jobs:
9292
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
9393
- name: Fetch the docker
9494
run: bash ci/fetch-rust-docker.bash "${TARGET}"
95-
- name: Install Protoc
96-
uses: arduino/setup-protoc@v1
97-
with:
98-
version: '3.x'
9995
- name: Maybe build a docker from there
10096
run: |
10197
if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then

.github/workflows/linux-builds-on-stable.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ jobs:
122122
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
123123
- name: Fetch the docker
124124
run: bash ci/fetch-rust-docker.bash "${TARGET}"
125-
- name: Install Protoc
126-
uses: arduino/setup-protoc@v1
127-
with:
128-
version: '3.x'
129125
- name: Maybe build a docker from there
130126
run: |
131127
if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then

ci/actions-templates/centos-fmt-clippy-template.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ jobs:
7272
run: |
7373
rustup component add rustfmt
7474
rustup component add clippy
75-
- name: Install Protoc
76-
uses: arduino/setup-protoc@v1
77-
with:
78-
version: '3.x'
7975
- name: Run the centos check within the docker image
8076
run: |
8177
docker run \

ci/actions-templates/linux-builds-template.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ jobs:
131131
echo "DOCKER=$DOCKER" >> $GITHUB_ENV
132132
- name: Fetch the docker
133133
run: bash ci/fetch-rust-docker.bash "${TARGET}"
134-
- name: Install Protoc
135-
uses: arduino/setup-protoc@v1
136-
with:
137-
version: '3.x'
138134
- name: Maybe build a docker from there
139135
run: |
140136
if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then

0 commit comments

Comments
 (0)