Skip to content

Commit a15f35c

Browse files
committed
ci: synchronize workflow
Signed-off-by: Mariana Ücker <mariana@freedom.ind.br>
1 parent 49509a8 commit a15f35c

File tree

1 file changed

+32
-15
lines changed

1 file changed

+32
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
merge_group:
66
push:
77
branches:
8-
- "master"
8+
- master
9+
- 'releases/**'
910

1011
concurrency:
1112
group: ${{ github.repository }}-${{ github.workflow }}
@@ -18,8 +19,7 @@ jobs:
1819
matrix: ${{ steps.set-matrix.outputs.matrix }}
1920
steps:
2021
- uses: actions/checkout@v4
21-
- uses: DeterminateSystems/nix-installer-action@v16
22-
- uses: DeterminateSystems/magic-nix-cache-action@v9
22+
- uses: nixbuild/nix-quick-install-action@v30
2323
- id: set-matrix
2424
name: Generate Nix Matrix
2525
run: |
@@ -28,7 +28,7 @@ jobs:
2828
matrix="$(nix eval --json '.#githubActions.matrix')"
2929
echo "matrix=${matrix}" >> "$GITHUB_OUTPUT"
3030
31-
nix-build:
31+
nix-check:
3232
needs: nix-matrix
3333
runs-on: ${{ matrix.os }}
3434
strategy:
@@ -37,21 +37,38 @@ jobs:
3737
matrix: ${{ fromJSON(needs.nix-matrix.outputs.matrix) }}
3838
steps:
3939
- uses: actions/checkout@v4
40-
- uses: DeterminateSystems/nix-installer-action@v16
41-
- uses: DeterminateSystems/magic-nix-cache-action@v9
40+
- uses: nixbuild/nix-quick-install-action@v30
41+
- name: Restore and cache Nix store
42+
uses: nix-community/cache-nix-action@v6
43+
with:
44+
primary-key: nix-${{ runner.os }}-${{ hashFiles('flake.*') }}
45+
restore-prefixes-first-match: nix-${{ runner.os }}-
4246
- run: nix build -L ".#${{ matrix.attr }}" --keep-going
4347

44-
- name: Twister Tests
45-
uses: workflow/nix-shell-action@v3.3.2
46-
id: twister-tests
48+
build:
49+
runs-on: ubuntu-latest
50+
strategy:
51+
fail-fast: false
52+
steps:
53+
- uses: actions/checkout@v4
54+
- uses: nixbuild/nix-quick-install-action@v30
55+
- name: Restore and cache Nix store
56+
uses: nix-community/cache-nix-action@v6
4757
with:
48-
flakes-from-devshell: true
49-
script: |
50-
west init -l .
51-
west config --global update.narrow true
52-
west update
58+
primary-key: nix-${{ runner.os }}-${{ hashFiles('flake.*') }}
59+
restore-prefixes-first-match: nix-${{ runner.os }}-
60+
61+
- name: Load Nix Development Shell
62+
uses: nicknovitski/nix-develop@v1
63+
64+
- name: Prepare Zephyr Project workspace
65+
run: |
66+
west config --global update.narrow true
67+
west update
5368
54-
./scripts/run-tests --clobber-output --inline-logs -v -N -M
69+
- name: Twister Tests
70+
id: twister-tests
71+
run: ./scripts/run-tests --clobber-output --inline-logs -v -N -M
5572

5673
- name: Merge Test Results
5774
if: steps.twister-tests.conclusion == 'failure'

0 commit comments

Comments
 (0)