Skip to content

Commit 37097f1

Browse files
committed
ci: use cachix action for nix cache
1 parent 1036e11 commit 37097f1

1 file changed

Lines changed: 27 additions & 22 deletions

File tree

‎.github/workflows/nix-ci.yml‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ jobs:
4949
extra-conf: |
5050
accept-flake-config = true
5151
52-
- name: Build and upload package
53-
env:
54-
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
55-
run: |
56-
: "${CACHIX_AUTH_TOKEN:?CACHIX_AUTH_TOKEN is required to upload to Cachix}"
57-
nix run --inputs-from . nixpkgs#cachix -- watch-exec openshell -- \
58-
nix build ".#packages.${{ matrix.target.system }}.${{ matrix.package }}" --no-link --no-update-lock-file
52+
- name: Set up Cachix
53+
uses: cachix/cachix-action@v17
54+
with:
55+
name: openshell
56+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
57+
skipAddingSubstituter: true
58+
59+
- name: Build package
60+
run: nix build ".#packages.${{ matrix.target.system }}.${{ matrix.package }}" --no-link --no-update-lock-file
5961

6062
test:
6163
name: Test ${{ matrix.check }} (${{ matrix.target.system }})
@@ -96,17 +98,18 @@ jobs:
9698
extra-conf: |
9799
accept-flake-config = true
98100
99-
- name: Run and upload test
100-
env:
101-
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
102-
run: |
103-
: "${CACHIX_AUTH_TOKEN:?CACHIX_AUTH_TOKEN is required to upload to Cachix}"
104-
nix run --inputs-from . nixpkgs#cachix -- watch-exec openshell -- \
105-
nix build ".#checks.${{ matrix.target.system }}.${{ matrix.check }}" --no-link --no-update-lock-file
101+
- name: Set up Cachix
102+
uses: cachix/cachix-action@v17
103+
with:
104+
name: openshell
105+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
106+
skipAddingSubstituter: true
107+
108+
- name: Run test
109+
run: nix build ".#checks.${{ matrix.target.system }}.${{ matrix.check }}" --no-link --no-update-lock-file
106110

107111
lint:
108112
name: Lint ${{ matrix.lint }} (${{ matrix.target.system }})
109-
needs: build
110113
runs-on: ${{ matrix.target.runner }}
111114
strategy:
112115
fail-fast: false
@@ -144,10 +147,12 @@ jobs:
144147
extra-conf: |
145148
accept-flake-config = true
146149
147-
- name: Run and upload lint
148-
env:
149-
CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
150-
run: |
151-
: "${CACHIX_AUTH_TOKEN:?CACHIX_AUTH_TOKEN is required to upload to Cachix}"
152-
nix run --inputs-from . nixpkgs#cachix -- watch-exec openshell -- \
153-
nix build ".#checks.${{ matrix.target.system }}.${{ matrix.lint }}" --no-link --no-update-lock-file
150+
- name: Set up Cachix
151+
uses: cachix/cachix-action@v17
152+
with:
153+
name: openshell
154+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
155+
skipAddingSubstituter: true
156+
157+
- name: Run lint
158+
run: nix build ".#checks.${{ matrix.target.system }}.${{ matrix.lint }}" --no-link --no-update-lock-file

0 commit comments

Comments
 (0)