Skip to content

Commit

Permalink
Merge branch 'master' of github.com:srid/haskell-flake
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Jun 24, 2024
2 parents 090cb57 + 6f6c8ec commit dfea80e
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 71 deletions.
20 changes: 16 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
name: "CI"

on:
push:
branches:
- master
pull_request:
workflow_dispatch:

jobs:

configure:
runs-on: self-hosted
runs-on: x86_64-linux
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- id: set-matrix
run: echo "matrix=$(nixci gh-matrix --systems=aarch64-linux,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT
run: echo "matrix=$(nixci gh-matrix --systems=x86_64-linux,x86_64-darwin,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT

nix:
runs-on: self-hosted
runs-on: ${{ matrix.system }}
permissions:
contents: read
needs: configure
strategy:
matrix: ${{ fromJson(needs.configure.outputs.matrix) }}
fail-fast: false
steps:
- uses: actions/checkout@v4
- run: nixci build --systems "github:nix-systems/${{ matrix.system }}" .#default.${{ matrix.subflake}}
- run: |
nixci \
--extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" \
build \
--systems "github:nix-systems/${{ matrix.system }}" \
.#default.${{ matrix.subflake}}
2 changes: 1 addition & 1 deletion dev/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
programs.nixpkgs-fmt.enable = true;
};
devShells.default = pkgs.mkShell {
# cf. https://community.flake.parts/haskell-flake#composing-devshells
# cf. https://community.flake.parts/haskell-flake/devshell#composing-devshells
inputsFrom = [
config.treefmt.build.devShell
];
Expand Down
119 changes: 59 additions & 60 deletions doc/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions example/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dfea80e

Please sign in to comment.