Skip to content

CI: Don't install no longer needed dependencies on i386 #10046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2022
Merged

CI: Don't install no longer needed dependencies on i386 #10046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb6a0aa
Revert "Use ubuntu-20.04 instead of ubuntu-latest"
flip1995 Dec 7, 2022
1c03cd3
Don't install dependencies on i386
flip1995 Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/clippy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 9 additions & 16 deletions .github/workflows/clippy_bors.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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/[email protected]

Expand Down Expand Up @@ -147,7 +140,7 @@ jobs:

metadata_collection:
needs: changelog
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
# Setup
Expand All @@ -166,7 +159,7 @@ jobs:

integration_build:
needs: changelog
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
# Setup
Expand Down Expand Up @@ -224,7 +217,7 @@ jobs:
- 'rust-lang-nursery/failure'
- 'rust-lang/log'

runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
# Setup
Expand Down Expand Up @@ -265,7 +258,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:
Expand All @@ -275,7 +268,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:
Expand Down