Skip to content

Commit d64e055

Browse files
authored
Merge pull request #133 from Artturin/nixciupdate
workflows/test.yml use macos-latest again and use nix release with
2 parents 8e09c9a + 0d8fd4b commit d64e055

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- run: yarn build
5353
- name: Install Nix
5454
uses: ./
55-
with:
55+
with:
5656
nix_path: nixpkgs=channel:nixos-20.03
5757
extra_nix_config: |
5858
sandbox = relaxed
@@ -88,7 +88,7 @@ jobs:
8888
- run: yarn build
8989
- name: Install Nix
9090
uses: ./
91-
with:
91+
with:
9292
nix_path: nixpkgs=channel:nixos-21.05
9393
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
9494
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
@@ -97,7 +97,7 @@ jobs:
9797
oldest-supported-installer:
9898
strategy:
9999
matrix:
100-
os: [ubuntu-latest, macos-10.15]
100+
os: [ubuntu-latest, macos-latest]
101101
runs-on: ${{ matrix.os }}
102102
steps:
103103
- uses: actions/checkout@v3
@@ -107,10 +107,10 @@ jobs:
107107
uses: ./
108108
with:
109109
nix_path: nixpkgs=channel:nixos-21.05
110-
install_url: https://releases.nixos.org/nix/nix-2.3.5/install
110+
install_url: https://releases.nixos.org/nix/nix-2.3.8/install
111111
- run: nix-build test.nix
112112

113-
act-support:
113+
act-support:
114114
strategy:
115115
matrix:
116116
os: [ubuntu-latest]
@@ -122,4 +122,4 @@ jobs:
122122
go-version: '^1.16'
123123
- run: go install github.com/nektos/act@latest
124124
- run: docker pull ghcr.io/catthehacker/ubuntu:js-20.04
125-
- run: ~/go/bin/act -P ubuntu-latest=ghcr.io/catthehacker/ubuntu:js-20.04 push -j simple-build
125+
- run: ~/go/bin/act -P ubuntu-latest=ghcr.io/catthehacker/ubuntu:js-20.04 push -j simple-build

0 commit comments

Comments
 (0)