Skip to content

Commit 38f7257

Browse files
committed
feat(ci): eval on blacksmith-32vcpu-ubuntu-2404
1 parent 7459e89 commit 38f7257

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/actionlint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ self-hosted-runner:
22
labels:
33
- aarch64-darwin
44
- aarch64-linux
5+
- blacksmith-32vcpu-ubuntu-2404

.github/actions/nix-build-setup/action.yml renamed to .github/actions/nix-build-self-hosted/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ runs:
3333
EOF
3434
- name: nix build
3535
shell: bash
36-
run: nix build -L .#${{ inputs.attr }}
36+
run: nix build --accept-flake-config -L .#${{ inputs.attr }}

.github/workflows/nix-build.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@ permissions:
1616

1717
jobs:
1818
nix-eval:
19-
runs-on:
20-
group: self-hosted-runners-nix
21-
labels:
22-
- aarch64-darwin
19+
runs-on: blacksmith-32vcpu-ubuntu-2404
2320
outputs:
2421
matrix: ${{ steps.set-matrix.outputs.matrix }}
2522
steps:
2623
- name: Checkout Repo
2724
uses: actions/checkout@v4
25+
- name: Install nix
26+
uses: cachix/install-nix-action@v31
27+
with:
28+
install_url: https://releases.nixos.org/nix/nix-2.31.2/install
2829
- id: set-matrix
2930
name: Generate Nix Matrix
3031
run: |
3132
set -Eeu
32-
echo matrix="$(python scripts/github-matrix.py checks legacyPackages)" >> "$GITHUB_OUTPUT"
33+
echo matrix="$(nix shell nixpkgs/405fc615369e0ea1b9c284c107ca4c3e1bc15774#nix-eval-jobs --command scripts/github-matrix.py checks legacyPackages)" >> "$GITHUB_OUTPUT"
3334
3435
nix-build-aarch64-linux:
3536
name: ${{ matrix.name }} (aarch64-linux)
@@ -44,7 +45,7 @@ jobs:
4445
- name: Checkout Repo
4546
uses: actions/checkout@v4
4647
- name: Build Nix Package
47-
uses: ./.github/actions/nix-build-setup
48+
uses: ./.github/actions/nix-build-self-hosted
4849
with:
4950
attr: ${{ matrix.attr }}
5051

@@ -61,7 +62,7 @@ jobs:
6162
- name: Checkout Repo
6263
uses: actions/checkout@v4
6364
- name: Build Nix Package
64-
uses: ./.github/actions/nix-build-setup
65+
uses: ./.github/actions/nix-build-self-hosted
6566
with:
6667
attr: ${{ matrix.attr }}
6768

@@ -79,14 +80,14 @@ jobs:
7980
# - name: Checkout Repo
8081
# uses: actions/checkout@v4
8182
# - name: Build Nix Package
82-
# uses: ./.github/actions/nix-build-setup
83+
# uses: ./.github/actions/nix-build-self-hosted
8384
# with:
8485
# attr: ${{ matrix.attr }}
8586

8687
run-testinfra:
8788
needs: [nix-build-aarch64-linux, nix-build-aarch64-darwin] #, nix-build-x86_64-linux]
8889
if: |
89-
!cancelled() &&
90+
!cancelled() &&
9091
(needs.nix-build-aarch64-linux.result == 'skipped' || needs.nix-build-aarch64-linux.result == 'success') &&
9192
(needs.nix-build-aarch64-darwin.result == 'skipped' || needs.nix-build-aarch64-darwin.result == 'success')
9293
uses: ./.github/workflows/testinfra-ami-build.yml
@@ -96,7 +97,7 @@ jobs:
9697
run-tests:
9798
needs: [nix-build-aarch64-linux, nix-build-aarch64-darwin] #, nix-build-x86_64-linux]
9899
if: |
99-
!cancelled() &&
100+
!cancelled() &&
100101
(needs.nix-build-aarch64-linux.result == 'skipped' || needs.nix-build-aarch64-linux.result == 'success') &&
101102
(needs.nix-build-aarch64-darwin.result == 'skipped' || needs.nix-build-aarch64-darwin.result == 'success')
102103
uses: ./.github/workflows/test.yml

0 commit comments

Comments
 (0)