Skip to content

Commit 9936253

Browse files
Fix CI Nix materialization check on release (#3180)
1 parent abb4874 commit 9936253

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ jobs:
1313
with:
1414
submodules: recursive
1515

16-
- name: Install Nix
17-
uses: cachix/install-nix-action@v14.1
16+
- name: 'Install Nix'
17+
uses: cachix/install-nix-action@v15
1818
with:
1919
extra_nix_config: |
20-
substituters = http://cache.nixos.org https://hydra.iohk.io
20+
substituters = http://cache.nixos.org https://cache.iog.io
2121
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
22-
install_url: "https://releases.nixos.org/nix/nix-2.3.16/install"
2322
2423
- name: Install Cachix
2524
uses: cachix/cachix-action@v10
@@ -28,8 +27,19 @@ jobs:
2827
extraPullNames: 'kore'
2928
skipPush: true
3029

30+
- name: Materialize
31+
run: nix run .#update-cabal
32+
33+
- name: Materialize GHC 9
34+
run: nix run .#update-cabal-ghc9
35+
3136
- name: Check materialization
32-
run: nix-build --arg checkMaterialization true -A project.stack-nix
37+
run: |
38+
if [ -n "$(git status --porcelain 'nix/')" ]; then
39+
echo 2>&1 "Error: found modified files"
40+
git diff
41+
exit 1
42+
fi
3343
3444
release:
3545
name: 'Release'

.github/workflows/update.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343

4444

4545
- name: Materialize
46-
run: GC_DONT_GC=1 nix run .#update-cabal
46+
run: nix run .#update-cabal
4747

4848
- name: Materialize GHC 9
49-
run: GC_DONT_GC=1 nix run .#update-cabal-ghc9
49+
run: nix run .#update-cabal-ghc9
5050

5151
- name: Update branch
5252
env:

0 commit comments

Comments
 (0)