From c6b90ff346c465096c1757d0726419f23a7e92b0 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Wed, 16 Aug 2023 16:21:24 +0200 Subject: [PATCH 1/2] Avoid installing protoc for most CI workflows It seems like it should only be needed for the all-features workflow, which enables `otel` via `--all-features`. Because we get rate-limited by something inside the setup-protoc Action, this is a fairly frequent source of spurious CI failures. --- .github/workflows/centos-fmt-clippy-on-all.yaml | 4 ---- .github/workflows/linux-builds-on-master.yaml | 4 ---- .github/workflows/linux-builds-on-pr.yaml | 4 ---- .github/workflows/linux-builds-on-stable.yaml | 4 ---- ci/actions-templates/centos-fmt-clippy-template.yaml | 4 ---- ci/actions-templates/linux-builds-template.yaml | 4 ---- 6 files changed, 24 deletions(-) diff --git a/.github/workflows/centos-fmt-clippy-on-all.yaml b/.github/workflows/centos-fmt-clippy-on-all.yaml index 47f1ca8d06..23baf85778 100644 --- a/.github/workflows/centos-fmt-clippy-on-all.yaml +++ b/.github/workflows/centos-fmt-clippy-on-all.yaml @@ -72,10 +72,6 @@ jobs: run: | rustup component add rustfmt rustup component add clippy - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Run the centos check within the docker image run: | docker run \ diff --git a/.github/workflows/linux-builds-on-master.yaml b/.github/workflows/linux-builds-on-master.yaml index 1eab933359..c037f90fcc 100644 --- a/.github/workflows/linux-builds-on-master.yaml +++ b/.github/workflows/linux-builds-on-master.yaml @@ -98,10 +98,6 @@ jobs: echo "DOCKER=$DOCKER" >> $GITHUB_ENV - name: Fetch the docker run: bash ci/fetch-rust-docker.bash "${TARGET}" - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Maybe build a docker from there run: | if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then diff --git a/.github/workflows/linux-builds-on-pr.yaml b/.github/workflows/linux-builds-on-pr.yaml index da3da8c630..d5ee9e8cd2 100644 --- a/.github/workflows/linux-builds-on-pr.yaml +++ b/.github/workflows/linux-builds-on-pr.yaml @@ -92,10 +92,6 @@ jobs: echo "DOCKER=$DOCKER" >> $GITHUB_ENV - name: Fetch the docker run: bash ci/fetch-rust-docker.bash "${TARGET}" - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Maybe build a docker from there run: | if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then diff --git a/.github/workflows/linux-builds-on-stable.yaml b/.github/workflows/linux-builds-on-stable.yaml index a6cf6f68d0..a345983b0a 100644 --- a/.github/workflows/linux-builds-on-stable.yaml +++ b/.github/workflows/linux-builds-on-stable.yaml @@ -122,10 +122,6 @@ jobs: echo "DOCKER=$DOCKER" >> $GITHUB_ENV - name: Fetch the docker run: bash ci/fetch-rust-docker.bash "${TARGET}" - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Maybe build a docker from there run: | if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then diff --git a/ci/actions-templates/centos-fmt-clippy-template.yaml b/ci/actions-templates/centos-fmt-clippy-template.yaml index 47f1ca8d06..23baf85778 100644 --- a/ci/actions-templates/centos-fmt-clippy-template.yaml +++ b/ci/actions-templates/centos-fmt-clippy-template.yaml @@ -72,10 +72,6 @@ jobs: run: | rustup component add rustfmt rustup component add clippy - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Run the centos check within the docker image run: | docker run \ diff --git a/ci/actions-templates/linux-builds-template.yaml b/ci/actions-templates/linux-builds-template.yaml index 9992d72569..5740f01182 100644 --- a/ci/actions-templates/linux-builds-template.yaml +++ b/ci/actions-templates/linux-builds-template.yaml @@ -131,10 +131,6 @@ jobs: echo "DOCKER=$DOCKER" >> $GITHUB_ENV - name: Fetch the docker run: bash ci/fetch-rust-docker.bash "${TARGET}" - - name: Install Protoc - uses: arduino/setup-protoc@v1 - with: - version: '3.x' - name: Maybe build a docker from there run: | if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then From dab4516ea4d0765dc3409bbcd0b8ea1a9233660e Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Thu, 17 Aug 2023 10:06:50 +0200 Subject: [PATCH 2/2] Authenticate when installing protoc In order to avoid getting rate limited. --- .github/workflows/all-features.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/all-features.yaml b/.github/workflows/all-features.yaml index beb62cece6..f3ea972461 100644 --- a/.github/workflows/all-features.yaml +++ b/.github/workflows/all-features.yaml @@ -30,6 +30,7 @@ jobs: uses: arduino/setup-protoc@v1 with: version: "3.x" + repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set environment variables appropriately for the build run: | echo "$HOME/.cargo/bin" >> $GITHUB_PATH