Skip to content

Commit 1211c4a

Browse files
authored
Merge branch 'master' into shc
2 parents d75da9d + dcf5072 commit 1211c4a

File tree

12 files changed

+658
-262
lines changed

12 files changed

+658
-262
lines changed

.github/workflows/ci.yaml

+33-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
name: "Build"
2+
23
on:
34
pull_request:
45
push:
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: true
10+
511
jobs:
612
tests:
713
strategy:
@@ -10,25 +16,47 @@ jobs:
1016
runs-on: ${{ matrix.os }}
1117
steps:
1218
- uses: actions/checkout@v4
13-
- uses: cachix/install-nix-action@v30
14-
- uses: cachix/cachix-action@v15
19+
- uses: cachix/install-nix-action@v31
20+
- uses: cachix/cachix-action@v16
1521
with:
1622
name: pre-commit-hooks
1723
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
1824
- run: rm -rf /opt&
1925
- run: nix-build --keep-going
26+
2027
tests-flakes:
2128
strategy:
2229
matrix:
2330
os: [ubuntu-latest, macos-latest]
2431
runs-on: ${{ matrix.os }}
2532
steps:
2633
- uses: actions/checkout@v4
27-
- uses: cachix/install-nix-action@v30
28-
- uses: cachix/cachix-action@v15
34+
- uses: cachix/install-nix-action@v31
35+
- uses: cachix/cachix-action@v16
2936
with:
3037
name: pre-commit-hooks
3138
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
3239
- run: rm -rf /opt&
33-
- run: nix flake check -L --show-trace
40+
41+
- name: Check nixpkgs-unstable
42+
run: nix flake check -L --show-trace
43+
3444
- run: nix eval .#lib.x86_64-linux.run --show-trace
45+
46+
tests-flakes-stable:
47+
strategy:
48+
matrix:
49+
os: [ubuntu-latest, macos-latest]
50+
runs-on: ${{ matrix.os }}
51+
steps:
52+
- uses: actions/checkout@v4
53+
- uses: cachix/install-nix-action@v31
54+
- uses: cachix/cachix-action@v16
55+
with:
56+
name: pre-commit-hooks
57+
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
58+
- run: rm -rf /opt&
59+
60+
- name: Check nixpkgs-stable
61+
run: nix flake check -L --show-trace --override-input nixpkgs github:NixOS/nixpkgs/nixos-24.11
62+

0 commit comments

Comments
 (0)