Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,13 @@ jobs:
os: ubuntu-20.04-8core-32gb
env: {}
- name: i686-gnu
os: ubuntu-20.04-16core-64gb
os: ubuntu-20.04-8core-32gb
env: {}
- name: i686-gnu-nopt
os: ubuntu-20.04-16core-64gb
os: ubuntu-20.04-8core-32gb
env: {}
- name: mingw-check
os: ubuntu-20.04-8core-32gb
os: ubuntu-20.04-4core-16gb
env: {}
- name: test-various
os: ubuntu-20.04-8core-32gb
Expand All @@ -275,16 +275,16 @@ jobs:
os: ubuntu-20.04-8core-32gb
env: {}
- name: x86_64-gnu
os: ubuntu-20.04-8core-32gb
os: ubuntu-20.04-4core-16gb
env: {}
- name: x86_64-gnu-stable
env:
IMAGE: x86_64-gnu
RUST_CI_OVERRIDE_RELEASE_CHANNEL: stable
CI_ONLY_WHEN_CHANNEL: nightly
os: ubuntu-20.04-8core-32gb
os: ubuntu-20.04-4core-16gb
- name: x86_64-gnu-aux
os: ubuntu-20.04-8core-32gb
os: ubuntu-20.04-4core-16gb
env: {}
- name: x86_64-gnu-debug
os: ubuntu-20.04-8core-32gb
Expand All @@ -309,7 +309,7 @@ jobs:
RUST_BACKTRACE: 1
os: ubuntu-20.04-8core-32gb
- name: x86_64-gnu-nopt
os: ubuntu-20.04-8core-32gb
os: ubuntu-20.04-4core-16gb
env: {}
- name: x86_64-gnu-tools
env:
Expand Down
18 changes: 11 additions & 7 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ x--expand-yaml-anchors--remove:
- &base-job
env: {}

- &job-linux-4c
os: ubuntu-20.04-4core-16gb
<<: *base-job

- &job-linux-8c
os: ubuntu-20.04-8core-32gb
<<: *base-job
Expand Down Expand Up @@ -416,13 +420,13 @@ jobs:
<<: *job-linux-8c

- name: i686-gnu
<<: *job-linux-16c
<<: *job-linux-8c

- name: i686-gnu-nopt
<<: *job-linux-16c
<<: *job-linux-8c

- name: mingw-check
<<: *job-linux-8c
<<: *job-linux-4c

- name: test-various
<<: *job-linux-8c
Expand All @@ -431,7 +435,7 @@ jobs:
<<: *job-linux-8c

- name: x86_64-gnu
<<: *job-linux-8c
<<: *job-linux-4c

# This job ensures commits landing on nightly still pass the full
# test suite on the stable channel. There are some UI tests that
Expand All @@ -446,10 +450,10 @@ jobs:
# could cause failures when `dev: 1` in `stage0.txt`, and running
# this on stable is useless.
CI_ONLY_WHEN_CHANNEL: nightly
<<: *job-linux-8c
<<: *job-linux-4c

- name: x86_64-gnu-aux
<<: *job-linux-8c
<<: *job-linux-4c

- name: x86_64-gnu-debug
<<: *job-linux-8c
Expand Down Expand Up @@ -478,7 +482,7 @@ jobs:
<<: *job-linux-8c

- name: x86_64-gnu-nopt
<<: *job-linux-8c
<<: *job-linux-4c

- name: x86_64-gnu-tools
env:
Expand Down