From 766b8830f160288823fcc93528bec456f567a14a Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:28:50 -0300 Subject: [PATCH 1/6] Provide new test matrix for source-* inputs --- .github/workflows/ci.yml | 67 +++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8307047..a7e7868 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -213,46 +213,37 @@ jobs: authorized-users: grahamc install-with-non-default-source-inputs: - name: Install Nix using non-default source-* inputs + name: Install Nix using non-default source-${{ matrix.inputs.key }} runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - - name: Install with alternative source-url - uses: ./ - with: - source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux - - name: Ensure that the expected Nix version is installed via alternative source-url - run: .github/verify-version.sh 2.21.2 - - - name: Install with alternative source-pr - uses: ./ - with: + strategy: + matrix: + inputs: + # https://github.com/DeterminateSystems/nix-installer/blob/v0.18.0 + - key: url + value: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux + nix-version: "2.21.2" # https://github.com/DeterminateSystems/nix-installer/pull/665 - source-pr: "665" - - name: Ensure that the expected Nix version is installed via alternative source-pr - run: .github/verify-version.sh 2.18.0 - - - name: Install with alternative source-revision - uses: ./ - with: - # https://github.com/DeterminateSystems/nix-installer/tree/ccf1d39a83099657ad324e7927676432435431e1 - source-revision: "ccf1d39a83099657ad324e7927676432435431e1" - - name: Ensure that the expected Nix version is installed via alternative source-revision - run: .github/verify-version.sh 2.21.2 - - - name: Install with alternative source-branch - uses: ./ - with: - # https://github.com/DeterminateSystems/nix-installer/tree/lazy-trees - source-revision: "lazy-trees" - - name: Ensure that the expected Nix version is installed via alternative source-branch - run: .github/verify-version.sh 2.21.2 + - key: pr + value: "665" + nix-version: "2.17.0" + # https://github.com/DeterminateSystems/nix-installer/tree/7011c077ec491da410fbc39f68676b0908b9ce7e + - key: revision + value: 7011c077ec491da410fbc39f68676b0908b9ce7e + nix-version: "2.19.2" + # https://github.com/DeterminateSystems/nix-installer/tree/nix-installer-action-test + - key: branch + value: nix-installer-action-test + nix-version: "2.21.2" + # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 + - key: tag + value: v0.14.0 + nix-version: "2.18.0" - - name: Install with alternative source-tag + steps: + - uses: actions/checkout@v4 + - name: Install with alternative source-${{ matrix.inputs.key }} uses: ./ with: - # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 - source-tag: "v0.14.0" - - name: Ensure that the expected Nix version is installed via alternative source-tag - run: .github/verify-version.sh 2.18.0 + source-${{ matrix.inputs.key }}: ${{ matrix.inputs.value }} + - name: Ensure that the expected Nix version ${{ matrix.inputs.nix-version }} is installed via alternative source-${{ matrix.inputs.key }} + run: .github/verify-version.sh ${{ matrix.inputs.nix-version }} From f97a8a062c9b19940b9c0e2b37df5b0fb757fdaa Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:32:15 -0300 Subject: [PATCH 2/6] Fix PR version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7e7868..dc6a07a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,10 +222,10 @@ jobs: - key: url value: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux nix-version: "2.21.2" - # https://github.com/DeterminateSystems/nix-installer/pull/665 + # https://github.com/DeterminateSystems/nix-installer/pull/738 - key: pr - value: "665" - nix-version: "2.17.0" + value: "738" + nix-version: "2.18.1" # https://github.com/DeterminateSystems/nix-installer/tree/7011c077ec491da410fbc39f68676b0908b9ce7e - key: revision value: 7011c077ec491da410fbc39f68676b0908b9ce7e From ccf4610648aabc60110556b98ef9f9a642151e8f Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:33:26 -0300 Subject: [PATCH 3/6] Fix branch version --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc6a07a..48ffede 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,10 +230,10 @@ jobs: - key: revision value: 7011c077ec491da410fbc39f68676b0908b9ce7e nix-version: "2.19.2" - # https://github.com/DeterminateSystems/nix-installer/tree/nix-installer-action-test + # https://github.com/DeterminateSystems/nix-installer/tree/replace-profile-scripts - key: branch - value: nix-installer-action-test - nix-version: "2.21.2" + value: replace-profile-scripts + nix-version: "2.18.1" # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 - key: tag value: v0.14.0 From 4ed4c86fdc8a8e83a72634b3b2cb24c88aadce05 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:35:28 -0300 Subject: [PATCH 4/6] Remove branch test --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48ffede..fee5d1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -230,10 +230,6 @@ jobs: - key: revision value: 7011c077ec491da410fbc39f68676b0908b9ce7e nix-version: "2.19.2" - # https://github.com/DeterminateSystems/nix-installer/tree/replace-profile-scripts - - key: branch - value: replace-profile-scripts - nix-version: "2.18.1" # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 - key: tag value: v0.14.0 From c1489fff7b8245c8f40b4610d8999a82c0bb2d51 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:37:53 -0300 Subject: [PATCH 5/6] Remove more tests --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fee5d1d..c6ed1ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,18 +222,10 @@ jobs: - key: url value: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.18.0/nix-installer-x86_64-linux nix-version: "2.21.2" - # https://github.com/DeterminateSystems/nix-installer/pull/738 - - key: pr - value: "738" - nix-version: "2.18.1" # https://github.com/DeterminateSystems/nix-installer/tree/7011c077ec491da410fbc39f68676b0908b9ce7e - key: revision value: 7011c077ec491da410fbc39f68676b0908b9ce7e nix-version: "2.19.2" - # https://github.com/DeterminateSystems/nix-installer/tree/v0.14.0 - - key: tag - value: v0.14.0 - nix-version: "2.18.0" steps: - uses: actions/checkout@v4 From 8cc782962a42b07cc07be978e44f719cbdff5c4f Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Fri, 17 May 2024 11:41:26 -0300 Subject: [PATCH 6/6] Add to tests --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6ed1ea..dcd7447 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: - check-dist-up-to-date - install-nix-linux - install-nix-macos + - install-with-non-default-source-inputs steps: - run: true