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 1/2] 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")

From b87861bd5dd962b8e76dc362c8876217aaa62020 Mon Sep 17 00:00:00 2001
From: Loren Gordon <lorengordon@users.noreply.github.com>
Date: Mon, 6 Nov 2023 08:37:17 -0800
Subject: [PATCH 2/2] Bumps version to 1.4.0

---
 .bumpversion.cfg | 2 +-
 CHANGELOG.md     | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 7f3ef72..3311577 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.2
+current_version = 1.4.0
 commit = True
 message = Bumps version to {new_version}
 tag = False
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcb1c7d..7e57cb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+### [1.4.0](https://github.com/plus3it/actions-workflows/releases/tag/1.4.0)
+
+**Released**: 2023.11.06
+
+**Summary**:
+
+*   Updates Windows Salt test to support retrieving the latest salt release for
+    a given salt major version. (The Linux Salt test already works this way.)
+
 ### [1.3.2](https://github.com/plus3it/actions-workflows/releases/tag/1.3.2)
 
 **Released**: 2023.08.14