Skip to content

Commit

Permalink
Merge pull request #33 from lorengordon/feat/windows-salt-use-major-v…
Browse files Browse the repository at this point in the history
…ersion
  • Loading branch information
lorengordon authored Nov 6, 2023
2 parents f62cdd6 + b87861b commit c9c3d11
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 18 additions & 2 deletions .github/workflows/test-salt-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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")
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c9c3d11

Please sign in to comment.