From 9342b170fb29b6605fdb05b3b5b0439f61e5bdcd Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 19 Oct 2023 17:48:09 -0700 Subject: [PATCH 1/2] fix: Runs on MacOS runners --- nix-develop-gha.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix-develop-gha.sh b/nix-develop-gha.sh index 44283bd..762cb81 100755 --- a/nix-develop-gha.sh +++ b/nix-develop-gha.sh @@ -3,7 +3,7 @@ set -euo pipefail # Read the arguments into an array, so they can be added correctly as flags -IFS=" " read -r -a arguments <<<"${@:-}" +IFS=" " read -r -a arguments <<<"${@:-./#default}" with_nix_develop() { nix develop --ignore-environment "${arguments[@]}" --command "$@" From e8d0a33c8777a9beaa80c0055c902bfd1508a459 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 19 Oct 2023 17:18:11 -0700 Subject: [PATCH 2/2] chore: Test on MacOS and with Determinate installer --- .github/workflows/ci.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c9be51..df53e4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,10 +6,28 @@ on: - 'releases/*' jobs: test: - runs-on: ubuntu-latest + strategy: + matrix: + runs-on: + - ubuntu-22.04 + - macos-13 + runs-on: ${{ matrix.runs-on }} steps: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v22 - uses: ./ - run: actionlint - run: shellcheck nix-develop-gha.sh + test-determinate: + strategy: + matrix: + runs-on: + - ubuntu-22.04 + - macos-13 + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v4 + - uses: DeterminateSystems/nix-installer-action@main + - uses: ./ + - run: actionlint + - run: shellcheck nix-develop-gha.sh