From 3b7676b3c879622befb0b3c05f0c2b07317349d6 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Mon, 18 Mar 2024 17:58:44 +0000 Subject: [PATCH] Remove invalid properties from existing GH actions --- .github/actions/build-onedir-deps/action.yml | 15 +++------------ .github/actions/build-onedir-salt/action.yml | 16 +++------------- .github/actions/build-source-tarball/action.yml | 9 +-------- .github/actions/cached-virtualenv/action.yml | 11 ++++------- .github/actions/download-artifact/action.yml | 1 + .github/actions/get-python-version/action.yml | 7 ++++++- .github/actions/setup-actionlint/action.yml | 3 ++- .github/actions/setup-pre-commit/action.yml | 6 ------ .../setup-python-tools-scripts/action.yml | 8 +------- .github/actions/setup-relenv/action.yml | 12 ++---------- .github/actions/setup-salt-version/action.yml | 13 +++++-------- .github/actions/setup-shellcheck/action.yml | 3 ++- .github/actions/upload-artifact/action.yml | 1 + 13 files changed, 31 insertions(+), 74 deletions(-) diff --git a/.github/actions/build-onedir-deps/action.yml b/.github/actions/build-onedir-deps/action.yml index 511fe5a5275..cdfdf7d917a 100644 --- a/.github/actions/build-onedir-deps/action.yml +++ b/.github/actions/build-onedir-deps/action.yml @@ -1,37 +1,26 @@ --- name: build-onedir-deps description: Build Onedir Dependencies + inputs: platform: required: true - type: string description: The platform to build arch: required: true - type: string description: The platform arch to build python-version: required: true - type: string description: The python version to build package-name: required: false - type: string description: The onedir package name to create default: salt cache-prefix: required: true - type: string description: Seed used to invalidate caches -env: - COLUMNS: 190 - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - RELENV_BUILDENV: 1 - - runs: using: composite @@ -56,6 +45,8 @@ runs: - name: Install Salt Onedir Package Dependencies shell: bash if: steps.onedir-pkg-cache.outputs.cache-hit != 'true' + env: + RELENV_BUILDENV: "1" run: | tools pkg build onedir-dependencies --arch ${{ inputs.arch }} --python-version ${{ inputs.python-version }} --package-name artifacts/${{ inputs.package-name }} --platform ${{ inputs.platform }} diff --git a/.github/actions/build-onedir-salt/action.yml b/.github/actions/build-onedir-salt/action.yml index 6952ccf98e4..2534cec01ed 100644 --- a/.github/actions/build-onedir-salt/action.yml +++ b/.github/actions/build-onedir-salt/action.yml @@ -1,41 +1,29 @@ --- name: build-onedir-salt description: Build Onedir Package + inputs: platform: required: true - type: string description: The platform to build arch: required: true - type: string description: The platform arch to build package-name: required: false - type: string description: The onedir package name to create default: salt cache-prefix: required: true - type: string description: Seed used to invalidate caches python-version: required: true - type: string description: The python version to build salt-version: - type: string required: true description: The Salt version to set prior to building packages. -env: - COLUMNS: 190 - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - RELENV_BUILDENV: 1 - - runs: using: composite @@ -64,6 +52,8 @@ runs: - name: Install Salt Into Onedir shell: bash + env: + RELENV_BUILDENV: "1" run: | tools pkg build salt-onedir salt-${{ inputs.salt-version }}.tar.gz --platform ${{ inputs.platform }} --package-name artifacts/${{ inputs.package-name }} diff --git a/.github/actions/build-source-tarball/action.yml b/.github/actions/build-source-tarball/action.yml index 8c662d8ee8b..22a5a674fca 100644 --- a/.github/actions/build-source-tarball/action.yml +++ b/.github/actions/build-source-tarball/action.yml @@ -1,24 +1,17 @@ --- name: build-source-tarball description: Build Source Tarball + inputs: salt-version: - type: string required: true description: The Salt version to set prior to building the tarball. nox-version: required: false - type: string description: The version of Nox to install default: "2022.8.7" -env: - COLUMNS: 190 - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - - runs: using: composite diff --git a/.github/actions/cached-virtualenv/action.yml b/.github/actions/cached-virtualenv/action.yml index f135d9116e5..4d0ddf099fa 100644 --- a/.github/actions/cached-virtualenv/action.yml +++ b/.github/actions/cached-virtualenv/action.yml @@ -5,26 +5,23 @@ description: Setup a cached python virtual environment inputs: name: required: true - type: string description: The Virtualenv Name cache-seed: required: true - type: string description: Seed used to invalidate caches + outputs: cache-hit: + description: 'A boolean value to indicate an exact match was found for the primary key' value: ${{ steps.cache-virtualenv.outputs.cache-hit }} cache-key: + description: The value of the cache key value: ${{ steps.setup-cache-key.outputs.cache-key }} python-executable: + description: The path to the virtualenv's python executable value: ${{ steps.define-python-executable.outputs.python-executable }} -env: - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - - runs: using: composite diff --git a/.github/actions/download-artifact/action.yml b/.github/actions/download-artifact/action.yml index 12a097f517f..f1b8e547b14 100644 --- a/.github/actions/download-artifact/action.yml +++ b/.github/actions/download-artifact/action.yml @@ -20,6 +20,7 @@ inputs: without overriding the existing archives. required: false + runs: using: composite steps: diff --git a/.github/actions/get-python-version/action.yml b/.github/actions/get-python-version/action.yml index f2b045f7ca7..a5bdc7f32a2 100644 --- a/.github/actions/get-python-version/action.yml +++ b/.github/actions/get-python-version/action.yml @@ -1,19 +1,24 @@ --- name: get-python-version description: Setup Relenv + inputs: python-binary: required: true - type: string description: The python binary to get the version from + outputs: binary: + description: The python binary executable value: ${{ steps.get-python-version.outputs.binary }} version: + description: The python version value: ${{ steps.get-python-version.outputs.version }} full-version: + description: The full python version value: ${{ steps.get-python-version.outputs.full-version }} version-sha256sum: + description: The sha256sum of the version value: ${{ steps.get-python-version.outputs.version-sha256sum }} diff --git a/.github/actions/setup-actionlint/action.yml b/.github/actions/setup-actionlint/action.yml index f1a81aaf35f..e965a9c60cf 100644 --- a/.github/actions/setup-actionlint/action.yml +++ b/.github/actions/setup-actionlint/action.yml @@ -1,15 +1,16 @@ --- name: setup-actionlint description: Setup actionlint + inputs: version: description: The version of actionlint default: 1.6.26 cache-seed: required: true - type: string description: Seed used to invalidate caches + runs: using: composite steps: diff --git a/.github/actions/setup-pre-commit/action.yml b/.github/actions/setup-pre-commit/action.yml index 82b8eef583d..ae62fa51edb 100644 --- a/.github/actions/setup-pre-commit/action.yml +++ b/.github/actions/setup-pre-commit/action.yml @@ -4,19 +4,13 @@ description: Setup 'pre-commit' inputs: version: - type: string description: Pre-commit version to install required: true default: 3.0.3 cache-seed: required: true - type: string description: Seed used to invalidate caches -env: - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - runs: using: composite diff --git a/.github/actions/setup-python-tools-scripts/action.yml b/.github/actions/setup-python-tools-scripts/action.yml index 9d5ff710346..d060c9d4a1b 100644 --- a/.github/actions/setup-python-tools-scripts/action.yml +++ b/.github/actions/setup-python-tools-scripts/action.yml @@ -5,23 +5,17 @@ description: Setup 'python-tools-scripts' inputs: cache-prefix: required: true - type: string description: Seed used to invalidate caches cwd: - type: string description: The directory the salt checkout is located in default: "." outputs: version: + description: "Return the python-tools-scripts version" value: ${{ steps.get-version.outputs.version }} -env: - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - - runs: using: composite diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml index c4cfd33f545..d8303a92447 100644 --- a/.github/actions/setup-relenv/action.yml +++ b/.github/actions/setup-relenv/action.yml @@ -1,39 +1,31 @@ --- name: setup-relenv description: Setup Relenv + inputs: platform: required: true - type: string description: The platform to build arch: required: true - type: string description: The platform arch to build python-version: required: true - type: string description: The version of python to build cache-seed: required: true - type: string description: Seed used to invalidate caches version: required: false - type: string description: The version of relenv to use default: 0.13.2 outputs: version: + description: The relenv version value: ${{ inputs.version }} -env: - PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/ - PIP_EXTRA_INDEX_URL: https://pypi.org/simple - - runs: using: composite diff --git a/.github/actions/setup-salt-version/action.yml b/.github/actions/setup-salt-version/action.yml index 9f21d6f002b..7d54c1c95b5 100644 --- a/.github/actions/setup-salt-version/action.yml +++ b/.github/actions/setup-salt-version/action.yml @@ -1,32 +1,29 @@ --- name: setup-salt-version description: Setup Salt Version + inputs: cwd: - type: string default: "" + description: The current working directory to use salt-version: - type: string default: "" description: > The Salt version to set prior to running tests or building packages. If not set, it is discover at run time, like, for example, capturing the output of running `python3 salt/version.py` validate-version: - type: boolean - default: false + default: "false" description: Validate the passed version. release: - type: boolean - default: false + default: "false" description: This is a release of salt. + outputs: salt-version: value: ${{ steps.setup-salt-version.outputs.salt-version }} description: The Salt version written to `salt/_version.txt` -env: - COLUMNS: 190 runs: using: composite diff --git a/.github/actions/setup-shellcheck/action.yml b/.github/actions/setup-shellcheck/action.yml index 2c86c98a072..9e5ad30365f 100644 --- a/.github/actions/setup-shellcheck/action.yml +++ b/.github/actions/setup-shellcheck/action.yml @@ -1,15 +1,16 @@ --- name: setup-shellcheck description: Setup shellcheck + inputs: version: description: The version of shellcheck default: v0.9.0 cache-seed: required: true - type: string description: Seed used to invalidate caches + runs: using: composite steps: diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index 6c9e940a3b3..eb00196a339 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -37,6 +37,7 @@ inputs: without overriding the existing archives. required: false + runs: using: composite steps: