mirror of
https://github.com/NixOS/nix.git
synced 2025-11-11 13:06:01 +01:00
Merge pull request #116 from DeterminateSystems/push-zrwpvlwurrkr
Don't build fallback-paths if we didn't build aarch64-linux and x86 d… …arwin
This commit is contained in:
commit
b0aa12df25
1 changed files with 3 additions and 2 deletions
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
|
@ -44,7 +44,7 @@ jobs:
|
||||||
build_aarch64-linux:
|
build_aarch64-linux:
|
||||||
uses: ./.github/workflows/build.yml
|
uses: ./.github/workflows/build.yml
|
||||||
with:
|
with:
|
||||||
if: ${{ github.event_name == 'merge_group' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
system: aarch64-linux
|
system: aarch64-linux
|
||||||
runner: UbuntuLatest32Cores128GArm
|
runner: UbuntuLatest32Cores128GArm
|
||||||
runner_small: UbuntuLatest32Cores128GArm
|
runner_small: UbuntuLatest32Cores128GArm
|
||||||
|
|
@ -52,7 +52,7 @@ jobs:
|
||||||
build_x86_64-darwin:
|
build_x86_64-darwin:
|
||||||
uses: ./.github/workflows/build.yml
|
uses: ./.github/workflows/build.yml
|
||||||
with:
|
with:
|
||||||
if: ${{ github.event_name == 'merge_group' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
system: x86_64-darwin
|
system: x86_64-darwin
|
||||||
runner: macos-latest-large
|
runner: macos-latest-large
|
||||||
runner_small: macos-latest-large
|
runner_small: macos-latest-large
|
||||||
|
|
@ -103,6 +103,7 @@ jobs:
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Build fallback-paths.nix
|
- name: Build fallback-paths.nix
|
||||||
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
run: |
|
run: |
|
||||||
nix build .#fallbackPathsNix --out-link fallback
|
nix build .#fallbackPathsNix --out-link fallback
|
||||||
cat fallback > ./artifacts/fallback-paths.nix
|
cat fallback > ./artifacts/fallback-paths.nix
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue