From dabb630e7f4f24d0e0654b1d0f4908557c8d6716 Mon Sep 17 00:00:00 2001
From: Martijn Pieters <mj@zopatista.com>
Date: Wed, 20 Nov 2024 11:12:13 +0000
Subject: [PATCH] ci: Correct variable used in install tests (#1977)

The `STRIP_V` env var should be set from the `set_binstall_version`
matrix variable.

While here, ensure that the install-script workflow is run whenever
the workflow itself is changed (in addition to the install scripts
themselves).
---
 .github/workflows/install-script.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/install-script.yml b/.github/workflows/install-script.yml
index 62768b03..b6ac7095 100644
--- a/.github/workflows/install-script.yml
+++ b/.github/workflows/install-script.yml
@@ -10,12 +10,14 @@ on:
     paths:
       - install-from-binstall-release.ps1
       - install-from-binstall-release.sh
+      - .github/workflows/install-script.yml
   push:
     branches:
       - main
     paths:
       - install-from-binstall-release.ps1
       - install-from-binstall-release.sh
+      - .github/workflows/install-script.yml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.event.pull_request.number || github.sha }}
@@ -48,7 +50,7 @@ jobs:
       - name: Set `BINSTALL_VERSION`
         if: matrix.set_binstall_version != 'no'
         env:
-          STRIP_V: ${{ matrix.set_cargo_home }}
+          STRIP_V: ${{ matrix.set_binstall_version }}
           GH_TOKEN: ${{ github.token }}
         run: |
           # fetch most recent release tag.
@@ -92,7 +94,7 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
-          STRIP_V: ${{ matrix.set_cargo_home }}
+          STRIP_V: ${{ matrix.set_binstall_version }}
         run: |
           # fetch most recent release name.
           BINSTALL_VERSION="$(gh release list --json name --jq '[.[] | select(.name | startswith("v")) | .name] | first')"
@@ -133,7 +135,7 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
-          STRIP_V: ${{ matrix.set_cargo_home }}
+          STRIP_V: ${{ matrix.set_binstall_version }}
         run: |
           # fetch most recent release name.
           BINSTALL_VERSION="$(gh release list --json name --jq '[.[] | select(.name | startswith("v")) | .name] | first')"