From 2b46f2c5dbb166d6137e7936cd7f26644ac5a1bc Mon Sep 17 00:00:00 2001
From: Loren Gordon <lorengordon@users.noreply.github.com>
Date: Mon, 6 Nov 2023 07:48:24 -0800
Subject: [PATCH] Supports specifying only the major version of salt for
 windows

---
 .github/workflows/test-salt-windows.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-salt-windows.yml b/.github/workflows/test-salt-windows.yml
index 26e5b41..92d32c0 100644
--- a/.github/workflows/test-salt-windows.yml
+++ b/.github/workflows/test-salt-windows.yml
@@ -17,7 +17,15 @@ on:
         type: string
       salt-installer-url:
         description: URL to the salt installer
-        default: https://repo.saltproject.io/salt/py3/windows/minor/3006.1/Salt-Minion-3006.1-Py3-AMD64-Setup.exe
+        default: ''
+        type: string
+      salt-version:
+        description: Version of salt to install
+        default: '3006'
+        type: string
+      salt-repo-base-url:
+        description: Base url to search for the salt version; `salt-version` is appended to this url
+        default: https://repo.saltproject.io/salt/py3/windows
         type: string
 
 defaults:
@@ -27,13 +35,21 @@ defaults:
 jobs:
   test:
     runs-on: ${{ inputs.salt-os-version}}
+    env:
+      LC_ALL: en_US.utf8
+      SALT_REPO_URL: https://repo.saltproject.io/salt/py3/windows/${{ inputs.salt-version }}
     steps:
       - name: Clone this git repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       # Install salt
-      - run: >
+      - if: inputs.salt-installer-url != ''
+        run: >
           curl -sSL -o "${TEMP}/salt-minion-installer.exe" "${{ inputs.salt-installer-url }}"
+      - if: inputs.salt-installer-url == ''
+        run: |
+          SALT_INSTALLER="${SALT_REPO_URL}/$(curl -s "${SALT_REPO_URL}/" | grep -Po '(?<=href=")[^"]*Py3-AMD64-Setup\.exe(?=")')"
+          curl -sSL -o "${TEMP}/salt-minion-installer.exe" "$SALT_INSTALLER"
       - run: >
           Start-Process -FilePath "${env:temp}\salt-minion-installer.exe"
           -ArgumentList @("/S", "/install-dir=c:\salt")