Skip to content

Commit f9a98af

Browse files
committed
Fix CI jobs with new recommended nix shell
1 parent 8ce8e13 commit f9a98af

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,24 @@ jobs:
4040
restore-keys: |
4141
cabal-${{ runner.os }}-${{ hashFiles('cabal.project', 'default.nix', 'shell.nix') }}
4242
43-
- name: Prepare nix shell
44-
run:
45-
nix develop --build
43+
- name: Enter nix shell
44+
uses: nicknovitski/nix-develop@v1
45+
with:
46+
arguments: "github:input-output-hk/devx#ghc96"
4647

4748
- name: Formatting
48-
run:
49-
nix develop --command fourmolu --mode check .
49+
run: fourmolu --mode check .
5050

5151
- name: Build
5252
run: |
53-
nix develop --command cabal update
54-
nix develop --command cabal build all --ghc-options=-Werror
53+
cabal update
54+
cabal build all --ghc-options=-Werror
5555
5656
- name: Test
57-
run:
58-
nix develop --command cabal test all
57+
run: cabal test all
5958

6059
- name: Documentation (Haddock)
61-
run: |
62-
nix develop --command .github/workflows/ci-haddock.sh
60+
run: .github/workflows/ci-haddock.sh
6361

6462
- name: Upload Documentation
6563
uses: actions/upload-artifact@v4

.github/workflows/release.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,20 @@ jobs:
3434
key: |
3535
cabal-${{ runner.os }}-${{ hashFiles('cabal.project', 'default.nix', 'shell.nix') }}
3636
37-
- name: Prepare nix shell
38-
run:
39-
nix develop --build
37+
- name: Enter nix shell
38+
uses: nicknovitski/nix-develop@v1
39+
with:
40+
arguments: "github:input-output-hk/devx#ghc96"
4041

4142
- name: Cabal check
4243
run: |
4344
cd quickcheck-dynamic
44-
nix develop --command cabal check
45+
cabal check
4546
4647
- name: Package
4748
run: |
48-
nix develop --command cabal sdist quickcheck-dynamic
49-
nix develop --command cabal haddock --haddock-for-hackage quickcheck-dynamic
49+
cabal sdist quickcheck-dynamic
50+
cabal haddock --haddock-for-hackage quickcheck-dynamic
5051
5152
- name: Get the version
5253
id: get_version

0 commit comments

Comments
 (0)