Skip to content

Commit dfea80e

Browse files
committed
Merge branch 'master' of github.com:srid/haskell-flake
2 parents 090cb57 + 6f6c8ec commit dfea80e

File tree

4 files changed

+82
-71
lines changed

4 files changed

+82
-71
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
11
name: "CI"
2+
23
on:
34
push:
45
branches:
56
- master
67
pull_request:
8+
workflow_dispatch:
9+
710
jobs:
11+
812
configure:
9-
runs-on: self-hosted
13+
runs-on: x86_64-linux
1014
outputs:
1115
matrix: ${{ steps.set-matrix.outputs.matrix }}
1216
steps:
1317
- uses: actions/checkout@v4
1418
- id: set-matrix
15-
run: echo "matrix=$(nixci gh-matrix --systems=aarch64-linux,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT
19+
run: echo "matrix=$(nixci gh-matrix --systems=x86_64-linux,x86_64-darwin,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT
20+
1621
nix:
17-
runs-on: self-hosted
22+
runs-on: ${{ matrix.system }}
23+
permissions:
24+
contents: read
1825
needs: configure
1926
strategy:
2027
matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
2128
fail-fast: false
2229
steps:
2330
- uses: actions/checkout@v4
24-
- run: nixci build --systems "github:nix-systems/${{ matrix.system }}" .#default.${{ matrix.subflake}}
31+
- run: |
32+
nixci \
33+
--extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" \
34+
build \
35+
--systems "github:nix-systems/${{ matrix.system }}" \
36+
.#default.${{ matrix.subflake}}

dev/flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
programs.nixpkgs-fmt.enable = true;
2121
};
2222
devShells.default = pkgs.mkShell {
23-
# cf. https://community.flake.parts/haskell-flake#composing-devshells
23+
# cf. https://community.flake.parts/haskell-flake/devshell#composing-devshells
2424
inputsFrom = [
2525
config.treefmt.build.devShell
2626
];

doc/flake.lock

Lines changed: 59 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)