From bb6a0aa8ed2051510ea2b6a997c2b2c9df8102e5 Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Wed, 7 Dec 2022 12:29:13 +0100 Subject: [PATCH 1/2] Revert "Use ubuntu-20.04 instead of ubuntu-latest" This reverts commit f170b1f01ab9e5faabc9c9b0080065603033b4c0. --- .github/workflows/clippy.yml | 2 +- .github/workflows/clippy_bors.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index a0fb23e76641..b99213011971 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -30,7 +30,7 @@ env: jobs: base: # NOTE: If you modify this job, make sure you copy the changes to clippy_bors.yml - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Setup diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 03e42e06744b..6448b2d4068d 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -19,7 +19,7 @@ defaults: jobs: changelog: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master @@ -53,12 +53,12 @@ jobs: needs: changelog strategy: matrix: - os: [ubuntu-20.04, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-latest] host: [x86_64-unknown-linux-gnu, i686-unknown-linux-gnu, x86_64-apple-darwin, x86_64-pc-windows-msvc] exclude: - - os: ubuntu-20.04 + - os: ubuntu-latest host: x86_64-apple-darwin - - os: ubuntu-20.04 + - os: ubuntu-latest host: x86_64-pc-windows-msvc - os: macos-latest host: x86_64-unknown-linux-gnu @@ -147,7 +147,7 @@ jobs: metadata_collection: needs: changelog - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Setup @@ -166,7 +166,7 @@ jobs: integration_build: needs: changelog - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Setup @@ -224,7 +224,7 @@ jobs: - 'rust-lang-nursery/failure' - 'rust-lang/log' - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # Setup @@ -265,7 +265,7 @@ jobs: end-success: name: bors test finished if: github.event.pusher.name == 'bors' && success() - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: [changelog, base, metadata_collection, integration_build, integration] steps: @@ -275,7 +275,7 @@ jobs: end-failure: name: bors test finished if: github.event.pusher.name == 'bors' && (failure() || cancelled()) - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: [changelog, base, metadata_collection, integration_build, integration] steps: From 1c03cd3fa34d6b317f33a2fd40e3d222a4d89a85 Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Wed, 7 Dec 2022 12:30:13 +0100 Subject: [PATCH 2/2] Don't install dependencies on i386 --- .github/workflows/clippy_bors.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 6448b2d4068d..1bc457a94793 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -82,13 +82,6 @@ jobs: with: github_token: "${{ secrets.github_token }}" - - name: Install dependencies (Linux-i686) - run: | - sudo dpkg --add-architecture i386 - sudo apt-get update - sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386 - if: matrix.host == 'i686-unknown-linux-gnu' - - name: Checkout uses: actions/checkout@v3.0.2