Skip to content

Commit 911864d

Browse files
committed
Auto merge of #10046 - flip1995:ci-i386, r=xFrednet
CI: Don't install no longer needed dependencies on i386 changelog: none closes #10040
2 parents d18f31e + 1c03cd3 commit 911864d

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

.github/workflows/clippy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ env:
3030
jobs:
3131
base:
3232
# NOTE: If you modify this job, make sure you copy the changes to clippy_bors.yml
33-
runs-on: ubuntu-20.04
33+
runs-on: ubuntu-latest
3434

3535
steps:
3636
# Setup

.github/workflows/clippy_bors.yml

+9-16
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defaults:
1919

2020
jobs:
2121
changelog:
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-latest
2323

2424
steps:
2525
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
@@ -53,12 +53,12 @@ jobs:
5353
needs: changelog
5454
strategy:
5555
matrix:
56-
os: [ubuntu-20.04, windows-latest, macos-latest]
56+
os: [ubuntu-latest, windows-latest, macos-latest]
5757
host: [x86_64-unknown-linux-gnu, i686-unknown-linux-gnu, x86_64-apple-darwin, x86_64-pc-windows-msvc]
5858
exclude:
59-
- os: ubuntu-20.04
59+
- os: ubuntu-latest
6060
host: x86_64-apple-darwin
61-
- os: ubuntu-20.04
61+
- os: ubuntu-latest
6262
host: x86_64-pc-windows-msvc
6363
- os: macos-latest
6464
host: x86_64-unknown-linux-gnu
@@ -82,13 +82,6 @@ jobs:
8282
with:
8383
github_token: "${{ secrets.github_token }}"
8484

85-
- name: Install dependencies (Linux-i686)
86-
run: |
87-
sudo dpkg --add-architecture i386
88-
sudo apt-get update
89-
sudo apt-get install gcc-multilib libssl-dev:i386 libgit2-dev:i386
90-
if: matrix.host == 'i686-unknown-linux-gnu'
91-
9285
- name: Checkout
9386
uses: actions/[email protected]
9487

@@ -147,7 +140,7 @@ jobs:
147140

148141
metadata_collection:
149142
needs: changelog
150-
runs-on: ubuntu-20.04
143+
runs-on: ubuntu-latest
151144

152145
steps:
153146
# Setup
@@ -166,7 +159,7 @@ jobs:
166159

167160
integration_build:
168161
needs: changelog
169-
runs-on: ubuntu-20.04
162+
runs-on: ubuntu-latest
170163

171164
steps:
172165
# Setup
@@ -224,7 +217,7 @@ jobs:
224217
- 'rust-lang-nursery/failure'
225218
- 'rust-lang/log'
226219

227-
runs-on: ubuntu-20.04
220+
runs-on: ubuntu-latest
228221

229222
steps:
230223
# Setup
@@ -265,7 +258,7 @@ jobs:
265258
end-success:
266259
name: bors test finished
267260
if: github.event.pusher.name == 'bors' && success()
268-
runs-on: ubuntu-20.04
261+
runs-on: ubuntu-latest
269262
needs: [changelog, base, metadata_collection, integration_build, integration]
270263

271264
steps:
@@ -275,7 +268,7 @@ jobs:
275268
end-failure:
276269
name: bors test finished
277270
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
278-
runs-on: ubuntu-20.04
271+
runs-on: ubuntu-latest
279272
needs: [changelog, base, metadata_collection, integration_build, integration]
280273

281274
steps:

0 commit comments

Comments
 (0)