From 7b4786efbd6a921dd74cdb242460f4c730a4369c Mon Sep 17 00:00:00 2001 From: thomasjm Date: Tue, 8 Oct 2024 17:33:45 -0700 Subject: [PATCH] ci: combine Nix jobs --- .github/workflows/ci.yml | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ddd73ad..16406bc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,25 +56,14 @@ jobs: path: ~/.stack key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.yaml }}-stack - nix-normal: - name: nix build .#normal - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - uses: cachix/install-nix-action@v27 - with: - # release-24.05 - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/74435c9234c751e6786c5f3fd34ff6b0f0c13bd1.tar.gz - - - uses: DeterminateSystems/magic-nix-cache-action@v8 - - name: Build - run: nix build .#normal - - nix-static: - name: nix build .#static + nix: + name: nix build .#${{ matrix.output }} runs-on: ubuntu-latest + strategy: + fail-fast: false + include: + - output: normal + - output: static steps: - uses: actions/checkout@v4 @@ -86,4 +75,4 @@ jobs: - uses: DeterminateSystems/magic-nix-cache-action@v8 - name: Build - run: nix build .#static + run: nix build .#${{ matrix.output }}