From 2ea9842f687cf70a9ed9ed2b287c44530f52bb51 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 10 Jul 2023 08:19:21 -0700 Subject: [PATCH 1/2] Uses bash on windows runner in salt test --- .github/workflows/test-salt-windows.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test-salt-windows.yml b/.github/workflows/test-salt-windows.yml index 01f2a41..811a82f 100644 --- a/.github/workflows/test-salt-windows.yml +++ b/.github/workflows/test-salt-windows.yml @@ -20,6 +20,10 @@ on: default: https://repo.saltproject.io/salt/py3/windows/minor/3006.1/Salt-Minion-3006.1-Py3-AMD64-Setup.exe type: string +defaults: + run: + shell: bash + jobs: test: runs-on: ${{ inputs.salt-os-version}} @@ -29,39 +33,32 @@ jobs: # Install salt - run: > - (new-object net.webclient).DownloadFile( - "${{ inputs.salt-installer-url }}", - "${env:temp}\salt-minion-installer.exe" ) - shell: pwsh + curl -sSL -o "${TEMP}/salt-minion-installer.exe" "${{ inputs.salt-installer-url }}" - run: > Start-Process -FilePath "${env:temp}\salt-minion-installer.exe" -ArgumentList @("/S", "/install-dir=c:\salt") -NoNewWindow -PassThru -Wait shell: pwsh - - run: C:\salt\salt-call.exe --versions-report - shell: pwsh + - run: C:\\salt\\salt-call.exe --versions-report # Sync custom salt modules, if any - run: > - C:\salt\salt-call.exe --local --retcode-passthrough + C:\\salt\\salt-call.exe --local --retcode-passthrough --log-file-level debug --file-root="${{ github.workspace }}" --pillar-root=${{ inputs.salt-pillar-root }} saltutil.sync_all - shell: pwsh # Run tests - run: > - C:\salt\salt-call.exe --local --retcode-passthrough + C:\\salt\\salt-call.exe --local --retcode-passthrough --log-file-level debug --file-root="${{ github.workspace }}" --pillar-root=${{ inputs.salt-pillar-root }} state.show_sls "${{ inputs.salt-state }}" - shell: pwsh - run: > - C:\salt\salt-call.exe --local --retcode-passthrough + C:\\salt\\salt-call.exe --local --retcode-passthrough --log-file-level debug --file-root="${{ github.workspace }}" --pillar-root=${{ inputs.salt-pillar-root }} state.sls "${{ inputs.salt-state }}" mock=True - shell: pwsh From 51f35f412847033c46b7c5d22db05214cf647629 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 17 Jul 2023 07:18:19 -0700 Subject: [PATCH 2/2] Bumps version to 1.3.1 --- .bumpversion.cfg | 2 +- CHANGELOG.md | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f7e0950..ac2caf5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.3.0 +current_version = 1.3.1 commit = True message = Bumps version to {new_version} tag = False diff --git a/CHANGELOG.md b/CHANGELOG.md index e08d617..c275e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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.3.1](https://github.com/plus3it/actions-workflows/releases/tag/1.3.1) + +**Released**: 2023.07.17 + +**Summary**: + +* Uses bash on Windows runners to validate steps using shellcheck + ### [1.3.0](https://github.com/plus3it/actions-workflows/releases/tag/1.3.0) **Released**: 2023.06.26