diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ac2caf5..3311577 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.3.1 +current_version = 1.4.0 commit = True message = Bumps version to {new_version} tag = False diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b411900..8301a7c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone this git repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Project Syntax Verification run: make docker/run target=${{ inputs.tardigradelint-target }} @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone this git repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Check workflow files - uses: reviewdog/action-actionlint@7485c2136bd093d2317a854c72910eebaee35238 + uses: reviewdog/action-actionlint@6a38513dd4d2e818798c5c73d0870adbb82de4a4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b53dca8..e5d3371 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 with: fetch-depth: 0 - run: git fetch --tags --force origin # WA: https://github.com/actions/checkout/issues/882 diff --git a/.github/workflows/test-salt-linux.yml b/.github/workflows/test-salt-linux.yml index 0e8f1eb..d9d4389 100644 --- a/.github/workflows/test-salt-linux.yml +++ b/.github/workflows/test-salt-linux.yml @@ -45,7 +45,7 @@ jobs: SALT_REPO_URL: ${{ format(inputs.salt-repo-url, inputs.salt-os-version) }} steps: - name: Clone this git repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Install salt - run: touch /etc/fstab diff --git a/.github/workflows/test-salt-windows.yml b/.github/workflows/test-salt-windows.yml index 811a82f..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@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + 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") diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 890c99a..84a2857 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,10 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Clone this git repository - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - - - name: Install docker-compose - run: make docker-compose/install + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Start the mock AWS stack run: make mockstack/up diff --git a/CHANGELOG.md b/CHANGELOG.md index c275e7c..7e57cb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ 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 + +**Summary**: + +* Remove install of docker-compose, it is no longer present in tardigrade-ci + ### [1.3.1](https://github.com/plus3it/actions-workflows/releases/tag/1.3.1) **Released**: 2023.07.17 diff --git a/Dockerfile b/Dockerfile index 125a5f6..28119ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM plus3it/tardigrade-ci:0.24.7 +FROM plus3it/tardigrade-ci:0.24.15