Skip to content

Commit 6bc278c

Browse files
authored
Merge pull request #759 from haskell-nix/joe-actions
Bump install-haskell cachix-action and install-nix-action
2 parents b1f7397 + c0f5b69 commit 6bc278c

File tree

4 files changed

+20
-12
lines changed

4 files changed

+20
-12
lines changed

.github/workflows/Cabal-Linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
~/.cabal/store
3030
dist-newstyle
3131
key: ${{ runner.os }}-Cabal-${{ matrix.ghc }}
32-
- uses: actions/setup-haskell@v1.1
32+
- uses: actions/setup-haskell@v1
3333
with:
3434
ghc-version: ${{ matrix.ghc }}
3535
- name: Install additional system packages
3636
run: sudo apt install libsodium-dev
3737
# 2020-08-01: NOTE: Nix instantiate still needed for HNix tests
3838
- name: Install Nix
39-
uses: cachix/install-nix-action@v10
39+
uses: cachix/install-nix-action@v12
4040
- run: cabal v2-configure --disable-optimization --enable-tests --enable-deterministic
4141
- run: cabal v2-build
4242
- run: cabal v2-test

.github/workflows/On-Release-Cabal-Linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ jobs:
2626
~/.cabal/store
2727
dist-newstyle
2828
key: ${{ runner.os }}-Cabal-${{ matrix.ghc }}
29-
- uses: actions/setup-haskell@v1.1
29+
- uses: actions/setup-haskell@v1
3030
with:
3131
ghc-version: ${{ matrix.ghc }}
3232
- name: Install additional system packages
3333
run: sudo apt install libsodium-dev
3434
# 2020-08-01: NOTE: Nix instantiate still needed for HNix tests
3535
- name: Install Nix
36-
uses: cachix/install-nix-action@v10
36+
uses: cachix/install-nix-action@v12
3737
- run: cabal v2-configure --disable-optimization --enable-tests --enable-deterministic
3838
- run: cabal v2-build
3939
- run: cabal v2-test

.github/workflows/Optional-Nix-dev-env-macOS.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ jobs:
2929
with:
3030
submodules: recursive
3131
- name: Install Nix
32-
uses: cachix/install-nix-action@v10
32+
uses: cachix/install-nix-action@v12
33+
with:
34+
nix_path: nixpkgs=channel:nixos-unstable
3335
- name: Install Cachix
34-
uses: cachix/cachix-action@v6
36+
uses: cachix/cachix-action@v7
3537
with:
3638
name: ${{ env.cachixAccount }}
3739
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

.github/workflows/Optional-Nix-dev-env-main.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ jobs:
6767
with:
6868
submodules: recursive
6969
- name: Install Nix
70-
uses: cachix/install-nix-action@v10
70+
uses: cachix/install-nix-action@v12
71+
with:
72+
nix_path: nixpkgs=channel:nixos-unstable
7173
- name: Install Cachix
72-
uses: cachix/cachix-action@v6
74+
uses: cachix/cachix-action@v7
7375
with:
7476
name: ${{ env.cachixAccount }}
7577
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
@@ -90,9 +92,11 @@ jobs:
9092
with:
9193
submodules: recursive
9294
- name: Install Nix
93-
uses: cachix/install-nix-action@v10
95+
uses: cachix/install-nix-action@v12
96+
with:
97+
nix_path: nixpkgs=channel:nixos-unstable
9498
- name: Install Cachix
95-
uses: cachix/cachix-action@v6
99+
uses: cachix/cachix-action@v7
96100
with:
97101
name: ${{ env.cachixAccount }}
98102
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
@@ -120,9 +124,11 @@ jobs:
120124
with:
121125
submodules: recursive
122126
- name: Install Nix
123-
uses: cachix/install-nix-action@v10
127+
uses: cachix/install-nix-action@v12
128+
with:
129+
nix_path: nixpkgs=channel:nixos-unstable
124130
- name: Install Cachix
125-
uses: cachix/cachix-action@v6
131+
uses: cachix/cachix-action@v7
126132
with:
127133
name: ${{ env.cachixAccount }}
128134
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'

0 commit comments

Comments
 (0)