mirror of
https://github.com/NixOS/nix
synced 2025-07-07 10:11:47 +02:00
GitHub CI: Use a bigger builder for x86_64-linux
Also, don't use a matrix for the 'tests' workflow, since we don't want the 'vm_tests' and 'flake_regressions' workflows to depend on aarch64-darwin.
This commit is contained in:
parent
51583851a2
commit
6ad333aeee
2 changed files with 32 additions and 16 deletions
27
.github/workflows/ci.yml
vendored
27
.github/workflows/ci.yml
vendored
|
@ -10,23 +10,18 @@ permissions:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
tests:
|
test_x86_64-linux:
|
||||||
strategy:
|
uses: ./.github/workflows/test.yml
|
||||||
fail-fast: false
|
with:
|
||||||
matrix:
|
os: UbuntuLatest32Cores128G
|
||||||
os: [ubuntu-latest, macos-latest]
|
|
||||||
runs-on: ${{ matrix.os }}
|
test_aarch64-darwin:
|
||||||
timeout-minutes: 60
|
uses: ./.github/workflows/test.yml
|
||||||
steps:
|
with:
|
||||||
- uses: actions/checkout@v4
|
os: macos-latest
|
||||||
- uses: DeterminateSystems/nix-installer-action@main
|
|
||||||
with:
|
|
||||||
flakehub: true
|
|
||||||
- uses: DeterminateSystems/magic-nix-cache-action@main
|
|
||||||
- run: nix flake check -L
|
|
||||||
|
|
||||||
vm_tests:
|
vm_tests:
|
||||||
needs: tests
|
needs: test_x86_64-linux
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -37,7 +32,7 @@ jobs:
|
||||||
- run: nix build -L .#hydraJobs.tests.githubFlakes .#hydraJobs.tests.tarballFlakes
|
- run: nix build -L .#hydraJobs.tests.githubFlakes .#hydraJobs.tests.tarballFlakes
|
||||||
|
|
||||||
flake_regressions:
|
flake_regressions:
|
||||||
needs: tests
|
needs: test_x86_64-linux
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout nix
|
- name: Checkout nix
|
||||||
|
|
21
.github/workflows/test.yml
vendored
Normal file
21
.github/workflows/test.yml
vendored
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
inputs:
|
||||||
|
os:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
tests:
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
runs-on: ${{ inputs.os }}
|
||||||
|
timeout-minutes: 60
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- uses: DeterminateSystems/nix-installer-action@main
|
||||||
|
with:
|
||||||
|
flakehub: true
|
||||||
|
- uses: DeterminateSystems/magic-nix-cache-action@main
|
||||||
|
- run: nix flake check -L
|
Loading…
Add table
Add a link
Reference in a new issue