From a9bbfd0e47301e612401c040e54ffbef4b36e85a Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 27 Jul 2023 13:43:12 +0100 Subject: [PATCH 1/4] Properly upgrade Debian based systems unattended Signed-off-by: Pedro Algarvio --- pkg/tests/conftest.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/tests/conftest.py b/pkg/tests/conftest.py index 5eba84bb4aa..b7d908f32d5 100644 --- a/pkg/tests/conftest.py +++ b/pkg/tests/conftest.py @@ -52,7 +52,18 @@ def _system_up_to_date( if grains["os_family"] == "Debian": ret = shell.run("apt", "update") assert ret.returncode == 0 - ret = shell.run("apt", "upgrade", "-y") + env = os.environ.copy() + env["DEBIAN_FRONTEND"] = "noninteractive" + ret = shell.run( + "apt", + "upgrade", + "-y", + "-o", + "DPkg::Options::=--force-confdef", + "-o", + "DPkg::Options::=--force-confold", + env=env, + ) assert ret.returncode == 0 elif grains["os_family"] == "Redhat": ret = shell.run("yum", "update", "-y") From 3877900698a52f6f0a36fb6c07ea2107c497cf34 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 26 Jul 2023 16:29:02 +0100 Subject: [PATCH 2/4] Upgrade `relenv` to `0.13.2` and Python to `3.10.12`. Addresses multiple CVEs in dependencies: https://docs.python.org/release/3.10.12/whatsnew/changelog.html#python-3-10-12 Signed-off-by: Pedro Algarvio --- .github/actions/setup-relenv/action.yml | 2 +- .github/workflows/build-deps-onedir.yml | 4 +- .github/workflows/build-salt-onedir.yml | 4 +- .github/workflows/ci.yml | 110 +++++++-------- .github/workflows/nightly.yml | 110 +++++++-------- .github/workflows/release.yml | 64 ++++----- .github/workflows/scheduled.yml | 110 +++++++-------- .github/workflows/staging.yml | 174 ++++++++++++------------ changelog/64719.security.md | 3 + cicd/shared-gh-workflows-context.yml | 4 +- pkg/macos/build_python.sh | 4 +- pkg/windows/build.ps1 | 6 +- pkg/windows/build_python.ps1 | 6 +- 13 files changed, 298 insertions(+), 303 deletions(-) create mode 100644 changelog/64719.security.md diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml index 1f228fd1822..50ade327764 100644 --- a/.github/actions/setup-relenv/action.yml +++ b/.github/actions/setup-relenv/action.yml @@ -22,7 +22,7 @@ inputs: required: false type: string description: The version of relenv to use - default: 0.12.3 + default: 0.13.2 outputs: version: diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index 6197ebc0333..c0371734bb7 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -21,12 +21,12 @@ on: relenv-version: required: false type: string - default: 0.12.3 + default: 0.13.2 description: The version of relenv to use python-version: required: false type: string - default: 3.10.9 + default: 3.10.12 description: The version of python to use with relenv env: diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 972176c8cee..bc89e8bb1e4 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -21,12 +21,12 @@ on: relenv-version: required: false type: string - default: 0.12.3 + default: 0.13.2 description: The version of relenv to use python-version: required: false type: string - default: 3.10.9 + default: 3.10.12 description: The version of python to use with relenv env: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a49625ba1f1..d00cac63b63 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -442,8 +442,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-salt-onedir: name: Build Salt Onedir @@ -458,8 +458,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-rpm-pkgs: name: Build RPM Packages @@ -470,8 +470,8 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-deb-pkgs: name: Build DEB Packages @@ -482,8 +482,8 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-windows-pkgs: name: Build Windows Packages @@ -494,8 +494,8 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-macos-pkgs: name: Build macOS Packages @@ -506,8 +506,8 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" amazonlinux-2-pkg-tests: name: Amazon Linux 2 Package Tests @@ -522,7 +522,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -540,7 +540,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -558,7 +558,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -576,7 +576,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -594,7 +594,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -612,7 +612,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -630,7 +630,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -648,7 +648,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -666,7 +666,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -684,7 +684,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -702,7 +702,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -720,7 +720,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -738,7 +738,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -756,7 +756,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -774,7 +774,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -792,7 +792,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -810,7 +810,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -828,7 +828,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -846,7 +846,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -864,7 +864,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -883,7 +883,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -901,7 +901,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -919,7 +919,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -937,7 +937,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -955,7 +955,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -973,7 +973,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -991,7 +991,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1009,7 +1009,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1027,7 +1027,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1045,7 +1045,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1063,7 +1063,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1081,7 +1081,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1099,7 +1099,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1117,7 +1117,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1135,7 +1135,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1153,7 +1153,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1171,7 +1171,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1189,7 +1189,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1207,7 +1207,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1225,7 +1225,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1243,7 +1243,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1261,7 +1261,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1279,7 +1279,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0ba1a998f5d..6413ea0cae6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -493,8 +493,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-salt-onedir: name: Build Salt Onedir @@ -509,8 +509,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-rpm-pkgs: name: Build RPM Packages @@ -521,8 +521,8 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-deb-pkgs: name: Build DEB Packages @@ -533,8 +533,8 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-windows-pkgs: name: Build Windows Packages @@ -545,8 +545,8 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" environment: nightly sign-packages: false secrets: inherit @@ -560,8 +560,8 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" environment: nightly sign-packages: true secrets: inherit @@ -579,7 +579,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -597,7 +597,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -615,7 +615,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -633,7 +633,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -651,7 +651,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -669,7 +669,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -687,7 +687,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -705,7 +705,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -723,7 +723,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -741,7 +741,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -759,7 +759,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -777,7 +777,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -795,7 +795,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -813,7 +813,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -831,7 +831,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -849,7 +849,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -867,7 +867,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -885,7 +885,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -903,7 +903,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -921,7 +921,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -940,7 +940,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -958,7 +958,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -976,7 +976,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -994,7 +994,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1012,7 +1012,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1030,7 +1030,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1048,7 +1048,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1066,7 +1066,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1084,7 +1084,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1102,7 +1102,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1120,7 +1120,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1138,7 +1138,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1156,7 +1156,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1174,7 +1174,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1192,7 +1192,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1210,7 +1210,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1228,7 +1228,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1246,7 +1246,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1264,7 +1264,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1282,7 +1282,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1300,7 +1300,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1318,7 +1318,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1336,7 +1336,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fa0a019a496..cdd66daf1af 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -232,7 +232,7 @@ jobs: distro-slug: almalinux-8 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -252,7 +252,7 @@ jobs: distro-slug: almalinux-8-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -272,7 +272,7 @@ jobs: distro-slug: almalinux-9 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -292,7 +292,7 @@ jobs: distro-slug: almalinux-9-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -312,7 +312,7 @@ jobs: distro-slug: amazonlinux-2 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -332,7 +332,7 @@ jobs: distro-slug: amazonlinux-2-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -352,7 +352,7 @@ jobs: distro-slug: centos-7 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -372,7 +372,7 @@ jobs: distro-slug: centos-7-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -392,7 +392,7 @@ jobs: distro-slug: centosstream-8 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -412,7 +412,7 @@ jobs: distro-slug: centosstream-8-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -432,7 +432,7 @@ jobs: distro-slug: centosstream-9 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -452,7 +452,7 @@ jobs: distro-slug: centosstream-9-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -472,7 +472,7 @@ jobs: distro-slug: debian-10 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -492,7 +492,7 @@ jobs: distro-slug: debian-11 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -512,7 +512,7 @@ jobs: distro-slug: debian-11-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -532,7 +532,7 @@ jobs: distro-slug: fedora-37 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -552,7 +552,7 @@ jobs: distro-slug: fedora-37-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -572,7 +572,7 @@ jobs: distro-slug: fedora-38 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -592,7 +592,7 @@ jobs: distro-slug: fedora-38-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -612,7 +612,7 @@ jobs: distro-slug: photonos-3 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -632,7 +632,7 @@ jobs: distro-slug: photonos-4 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -652,7 +652,7 @@ jobs: distro-slug: ubuntu-20.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -672,7 +672,7 @@ jobs: distro-slug: ubuntu-20.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -692,7 +692,7 @@ jobs: distro-slug: ubuntu-22.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -712,7 +712,7 @@ jobs: distro-slug: ubuntu-22.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -732,7 +732,7 @@ jobs: distro-slug: ubuntu-22.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -752,7 +752,7 @@ jobs: distro-slug: ubuntu-22.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -772,7 +772,7 @@ jobs: distro-slug: macos-12 platform: darwin arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -792,7 +792,7 @@ jobs: distro-slug: macos-12 platform: darwin arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -813,7 +813,7 @@ jobs: platform: windows arch: amd64 pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -833,7 +833,7 @@ jobs: platform: windows arch: amd64 pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true @@ -853,7 +853,7 @@ jobs: platform: windows arch: amd64 pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: release skip-code-coverage: true diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 9bd70b42e00..c9cdcc7db46 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -478,8 +478,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-salt-onedir: name: Build Salt Onedir @@ -494,8 +494,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-rpm-pkgs: name: Build RPM Packages @@ -506,8 +506,8 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-deb-pkgs: name: Build DEB Packages @@ -518,8 +518,8 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-windows-pkgs: name: Build Windows Packages @@ -530,8 +530,8 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-macos-pkgs: name: Build macOS Packages @@ -542,8 +542,8 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" amazonlinux-2-pkg-tests: name: Amazon Linux 2 Package Tests @@ -558,7 +558,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -576,7 +576,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -594,7 +594,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -612,7 +612,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -630,7 +630,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -648,7 +648,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -666,7 +666,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -684,7 +684,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -702,7 +702,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -720,7 +720,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -738,7 +738,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -756,7 +756,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -774,7 +774,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -792,7 +792,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -810,7 +810,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -828,7 +828,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -846,7 +846,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -864,7 +864,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -882,7 +882,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -900,7 +900,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -919,7 +919,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -937,7 +937,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -955,7 +955,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -973,7 +973,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -991,7 +991,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1009,7 +1009,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1027,7 +1027,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1045,7 +1045,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1063,7 +1063,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1081,7 +1081,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1099,7 +1099,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1117,7 +1117,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1135,7 +1135,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1153,7 +1153,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1171,7 +1171,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1189,7 +1189,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1207,7 +1207,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1225,7 +1225,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1243,7 +1243,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1261,7 +1261,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1279,7 +1279,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1297,7 +1297,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false @@ -1315,7 +1315,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: false skip-junit-reports: false diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index cbcbd42e9c0..cf914e0943a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -478,8 +478,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-salt-onedir: name: Build Salt Onedir @@ -494,8 +494,8 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }} - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-rpm-pkgs: name: Build RPM Packages @@ -506,8 +506,8 @@ jobs: uses: ./.github/workflows/build-rpm-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-deb-pkgs: name: Build DEB Packages @@ -518,8 +518,8 @@ jobs: uses: ./.github/workflows/build-deb-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" build-windows-pkgs: name: Build Windows Packages @@ -530,8 +530,8 @@ jobs: uses: ./.github/workflows/build-windows-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" environment: staging sign-packages: ${{ inputs.sign-windows-packages }} secrets: inherit @@ -545,8 +545,8 @@ jobs: uses: ./.github/workflows/build-macos-packages.yml with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.12.3" - python-version: "3.10.11" + relenv-version: "0.13.2" + python-version: "3.10.12" environment: staging sign-packages: true secrets: inherit @@ -564,7 +564,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -582,7 +582,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -600,7 +600,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -618,7 +618,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -636,7 +636,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -654,7 +654,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -672,7 +672,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -690,7 +690,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -708,7 +708,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: rpm - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -726,7 +726,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -744,7 +744,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -762,7 +762,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -780,7 +780,7 @@ jobs: arch: aarch64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: deb - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -798,7 +798,7 @@ jobs: arch: x86_64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: macos - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -816,7 +816,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -834,7 +834,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -852,7 +852,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -870,7 +870,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -888,7 +888,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: NSIS - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -906,7 +906,7 @@ jobs: arch: amd64 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" pkg-type: MSI - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -925,7 +925,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -943,7 +943,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -961,7 +961,7 @@ jobs: arch: amd64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -979,7 +979,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -997,7 +997,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1015,7 +1015,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1033,7 +1033,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1051,7 +1051,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1069,7 +1069,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1087,7 +1087,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1105,7 +1105,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1123,7 +1123,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1141,7 +1141,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1159,7 +1159,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1177,7 +1177,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1195,7 +1195,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1213,7 +1213,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1231,7 +1231,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1249,7 +1249,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1267,7 +1267,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1285,7 +1285,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1303,7 +1303,7 @@ jobs: arch: x86_64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -1321,7 +1321,7 @@ jobs: arch: aarch64 testrun: ${{ needs.prepare-workflow.outputs.testrun }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 skip-code-coverage: true skip-junit-reports: true @@ -2083,7 +2083,7 @@ jobs: distro-slug: almalinux-8 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2102,7 +2102,7 @@ jobs: distro-slug: almalinux-8-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2121,7 +2121,7 @@ jobs: distro-slug: almalinux-9 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2140,7 +2140,7 @@ jobs: distro-slug: almalinux-9-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2159,7 +2159,7 @@ jobs: distro-slug: amazonlinux-2 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2178,7 +2178,7 @@ jobs: distro-slug: amazonlinux-2-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2197,7 +2197,7 @@ jobs: distro-slug: centos-7 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2216,7 +2216,7 @@ jobs: distro-slug: centos-7-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2235,7 +2235,7 @@ jobs: distro-slug: centosstream-8 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2254,7 +2254,7 @@ jobs: distro-slug: centosstream-8-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2273,7 +2273,7 @@ jobs: distro-slug: centosstream-9 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2292,7 +2292,7 @@ jobs: distro-slug: centosstream-9-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2311,7 +2311,7 @@ jobs: distro-slug: debian-10 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2330,7 +2330,7 @@ jobs: distro-slug: debian-11 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2349,7 +2349,7 @@ jobs: distro-slug: debian-11-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2368,7 +2368,7 @@ jobs: distro-slug: fedora-37 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2387,7 +2387,7 @@ jobs: distro-slug: fedora-37-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2406,7 +2406,7 @@ jobs: distro-slug: fedora-38 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2425,7 +2425,7 @@ jobs: distro-slug: fedora-38-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2444,7 +2444,7 @@ jobs: distro-slug: photonos-3 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2463,7 +2463,7 @@ jobs: distro-slug: photonos-4 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2482,7 +2482,7 @@ jobs: distro-slug: ubuntu-20.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2501,7 +2501,7 @@ jobs: distro-slug: ubuntu-20.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2520,7 +2520,7 @@ jobs: distro-slug: ubuntu-22.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2539,7 +2539,7 @@ jobs: distro-slug: ubuntu-22.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2558,7 +2558,7 @@ jobs: distro-slug: ubuntu-22.04 platform: linux arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2577,7 +2577,7 @@ jobs: distro-slug: ubuntu-22.04-arm64 platform: linux arch: aarch64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2596,7 +2596,7 @@ jobs: distro-slug: macos-12 platform: darwin arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2615,7 +2615,7 @@ jobs: distro-slug: macos-12 platform: darwin arch: x86_64 - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2635,7 +2635,7 @@ jobs: platform: windows arch: amd64 pkg-type: nsis - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2654,7 +2654,7 @@ jobs: platform: windows arch: amd64 pkg-type: msi - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true @@ -2673,7 +2673,7 @@ jobs: platform: windows arch: amd64 pkg-type: onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.12 salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" environment: staging skip-code-coverage: true diff --git a/changelog/64719.security.md b/changelog/64719.security.md new file mode 100644 index 00000000000..3476499d3d7 --- /dev/null +++ b/changelog/64719.security.md @@ -0,0 +1,3 @@ +Upgrade `relenv` to `0.13.2` and Python to `3.10.12` + +Addresses multiple CVEs in Python's dependencies: https://docs.python.org/release/3.10.12/whatsnew/changelog.html#python-3-10-12 diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index b554b57aafa..846d5625320 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,2 +1,2 @@ -python_version: "3.10.11" -relenv_version: "0.12.3" +python_version: "3.10.12" +relenv_version: "0.13.2" diff --git a/pkg/macos/build_python.sh b/pkg/macos/build_python.sh index be179b7b166..7d65dca843b 100755 --- a/pkg/macos/build_python.sh +++ b/pkg/macos/build_python.sh @@ -48,8 +48,8 @@ _usage() { echo " -v, --version version of python to install, must be available with relenv" echo " -r, --relenv-version version of python to install, must be available with relenv" echo "" - echo " To build python 3.10.11:" - echo " example: $0 --version 3.10.11" + echo " To build python 3.10.12:" + echo " example: $0 --version 3.10.12" } # _msg diff --git a/pkg/windows/build.ps1 b/pkg/windows/build.ps1 index 6c5cac2ac17..ac273a6c163 100644 --- a/pkg/windows/build.ps1 +++ b/pkg/windows/build.ps1 @@ -38,12 +38,8 @@ param( [Parameter(Mandatory=$false)] [ValidatePattern("^\d{1,2}.\d{1,2}.\d{1,2}$")] - [ValidateSet( - "3.11.3", - "3.10.11" - )] [Alias("p")] - [String] $PythonVersion = "3.10.11", + [String] $PythonVersion = "3.10.12", [Parameter(Mandatory=$false)] [Alias("r")] diff --git a/pkg/windows/build_python.ps1 b/pkg/windows/build_python.ps1 index e91f41fea00..90a2b053a92 100644 --- a/pkg/windows/build_python.ps1 +++ b/pkg/windows/build_python.ps1 @@ -17,12 +17,8 @@ build_python.ps1 -Version 3.10.9 -Architecture x86 param( [Parameter(Mandatory=$false)] [ValidatePattern("^\d{1,2}.\d{1,2}.\d{1,2}$")] - [ValidateSet( - "3.11.3", - "3.10.11" - )] [Alias("v")] - [String] $Version = "3.10.11", + [String] $Version = "3.10.12", [Parameter(Mandatory=$false)] [Alias("r")] From 301df340e7c123bb70cfe4bf4b3472b4e5a74408 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 26 Jul 2023 12:17:13 +0100 Subject: [PATCH 3/4] Bump to `certifi==2023.07.22` due to https://github.com/advisories/GHSA-xqr8-7jwr-rhp7 Signed-off-by: Pedro Algarvio --- changelog/64718.security.md | 1 + requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/docs.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/pkgtests-windows.txt | 2 +- requirements/static/ci/py3.10/pkgtests.txt | 2 +- requirements/static/ci/py3.10/tools.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/tools.txt | 2 +- requirements/static/ci/py3.7/cloud.txt | 2 +- requirements/static/ci/py3.7/docs.txt | 2 +- requirements/static/ci/py3.7/freebsd.txt | 2 +- requirements/static/ci/py3.7/lint.txt | 2 +- requirements/static/ci/py3.7/linux.txt | 2 +- requirements/static/ci/py3.7/windows.txt | 2 +- requirements/static/ci/py3.8/cloud.txt | 2 +- requirements/static/ci/py3.8/docs.txt | 2 +- requirements/static/ci/py3.8/freebsd.txt | 2 +- requirements/static/ci/py3.8/lint.txt | 2 +- requirements/static/ci/py3.8/linux.txt | 2 +- requirements/static/ci/py3.8/windows.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/docs.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/tools.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.7/freebsd.txt | 2 +- requirements/static/pkg/py3.7/linux.txt | 2 +- requirements/static/pkg/py3.7/windows.txt | 2 +- requirements/static/pkg/py3.8/freebsd.txt | 2 +- requirements/static/pkg/py3.8/linux.txt | 2 +- requirements/static/pkg/py3.8/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- 46 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 changelog/64718.security.md diff --git a/changelog/64718.security.md b/changelog/64718.security.md new file mode 100644 index 00000000000..b40aef1ad85 --- /dev/null +++ b/changelog/64718.security.md @@ -0,0 +1 @@ +Bump to `certifi==2023.07.22` due to https://github.com/advisories/GHSA-xqr8-7jwr-rhp7 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index b18ec4f09c0..1862a07681f 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -350,7 +350,7 @@ cachetools==4.2.2 # via google-auth cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index c0975217c25..8a284e31b47 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -350,7 +350,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index ce07a3a5061..588b8682f56 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2022.12.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.10/linux.txt # requests diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index baaf1233d53..69dc466b7a4 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -348,7 +348,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index dc2efbcb0f7..4d56f17f2bc 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -353,7 +353,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 973d015842a..950e88180a5 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -361,7 +361,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt index fc22d0a9805..de7ee93e182 100644 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ b/requirements/static/ci/py3.10/pkgtests-windows.txt @@ -13,7 +13,7 @@ attrs==22.2.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via clr-loader diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index bb18c792933..127e64a8857 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -13,7 +13,7 @@ attrs==22.2.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2022.12.7 +certifi==2023.07.22 # via requests charset-normalizer==3.0.1 # via requests diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index 4981fc3c640..13305fb83a5 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -14,7 +14,7 @@ botocore==1.24.46 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.07.22 # via requests charset-normalizer==3.0.1 # via requests diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 2417941f38e..b345f558795 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -36,7 +36,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt index 556718941f1..733d7d186c6 100644 --- a/requirements/static/ci/py3.11/tools.txt +++ b/requirements/static/ci/py3.11/tools.txt @@ -14,7 +14,7 @@ botocore==1.24.46 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.07.22 # via requests charset-normalizer==3.0.1 # via requests diff --git a/requirements/static/ci/py3.7/cloud.txt b/requirements/static/ci/py3.7/cloud.txt index 6eaf60aa529..0823fc8ff75 100644 --- a/requirements/static/ci/py3.7/cloud.txt +++ b/requirements/static/ci/py3.7/cloud.txt @@ -352,7 +352,7 @@ cachetools==4.2.2 # via google-auth cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.7/docs.txt b/requirements/static/ci/py3.7/docs.txt index 96093a63491..31209a994b2 100644 --- a/requirements/static/ci/py3.7/docs.txt +++ b/requirements/static/ci/py3.7/docs.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2022.12.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.7/linux.txt # requests diff --git a/requirements/static/ci/py3.7/freebsd.txt b/requirements/static/ci/py3.7/freebsd.txt index cb2a33a878a..25fb5d4857e 100644 --- a/requirements/static/ci/py3.7/freebsd.txt +++ b/requirements/static/ci/py3.7/freebsd.txt @@ -350,7 +350,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.7/lint.txt b/requirements/static/ci/py3.7/lint.txt index 84fb45bda87..b7f48d8b01a 100644 --- a/requirements/static/ci/py3.7/lint.txt +++ b/requirements/static/ci/py3.7/lint.txt @@ -357,7 +357,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.7/linux.txt b/requirements/static/ci/py3.7/linux.txt index 4572c8bdbf3..b06cf80b7b6 100644 --- a/requirements/static/ci/py3.7/linux.txt +++ b/requirements/static/ci/py3.7/linux.txt @@ -363,7 +363,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.7/windows.txt b/requirements/static/ci/py3.7/windows.txt index 8959a773789..548a60f8f9d 100644 --- a/requirements/static/ci/py3.7/windows.txt +++ b/requirements/static/ci/py3.7/windows.txt @@ -42,7 +42,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 0efdfc4ddb6..7393b82c4c8 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -350,7 +350,7 @@ cachetools==4.2.2 # via google-auth cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 3f7c81f3f36..da96a0c3bfb 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2022.12.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.8/linux.txt # requests diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 5bc0834aa96..c6b357d4173 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -348,7 +348,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index 75cae1cbec6..85cd7200930 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -355,7 +355,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index f9bf547397f..7aeac2980c8 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -361,7 +361,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index 63b94d8153c..e5bdaa0a625 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -38,7 +38,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 284da11446c..dd9b361d956 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -350,7 +350,7 @@ cachetools==4.2.2 # via google-auth cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index cd6ea9161f0..3b2a0993068 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -350,7 +350,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 96c88b70650..772a37c357a 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -8,7 +8,7 @@ alabaster==0.7.12 # via sphinx babel==2.9.1 # via sphinx -certifi==2022.12.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.9/linux.txt # requests diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 6a6eecc62de..0937c4827bf 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -348,7 +348,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.24.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 0797e729902..7fdb2b8b3fe 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -353,7 +353,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.25.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 24cd91c4204..d2720993b2e 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -363,7 +363,7 @@ cachetools==4.2.2 # python-telegram-bot cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # kubernetes diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index 36efc836b96..245b5fcffcd 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -14,7 +14,7 @@ botocore==1.24.46 # via # boto3 # s3transfer -certifi==2022.12.7 +certifi==2023.07.22 # via requests charset-normalizer==3.0.1 # via requests diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 282303ad60b..cd5f59e18de 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -38,7 +38,7 @@ cachetools==3.1.0 # via google-auth cassandra-driver==3.23.0 # via -r requirements/static/ci/common.in -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/static/ci/common.in # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 754590ec08c..e2667937927 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -6,7 +6,7 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index deb75954935..8d2fe56ad5a 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 3297db360e7..2219e99e56a 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 00e2e6afb64..889f1288b18 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests diff --git a/requirements/static/pkg/py3.7/freebsd.txt b/requirements/static/pkg/py3.7/freebsd.txt index 9ec3d70b083..af258097ffd 100644 --- a/requirements/static/pkg/py3.7/freebsd.txt +++ b/requirements/static/pkg/py3.7/freebsd.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.7/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.7/linux.txt b/requirements/static/pkg/py3.7/linux.txt index 1d99400bc04..376d4300a45 100644 --- a/requirements/static/pkg/py3.7/linux.txt +++ b/requirements/static/pkg/py3.7/linux.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.7/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.7/windows.txt b/requirements/static/pkg/py3.7/windows.txt index b2ca9952545..9b12b209653 100644 --- a/requirements/static/pkg/py3.7/windows.txt +++ b/requirements/static/pkg/py3.7/windows.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.7/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index bbf7ee1d199..d95e3798e96 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.8/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index ebce5bb275e..59c1f49d169 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.8/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 3c0d8d61c7e..96d4e217b1a 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.8/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 44efe7b101c..89449fc9055 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -6,7 +6,7 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 0320950393d..739271e590e 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 6b378323c49..6c5fed38051 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via requests cffi==1.14.6 # via cryptography diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index c3a11718dd9..42ca414ea99 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # -certifi==2022.12.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests From 897360029e03d61916804710e41b6c481178346c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Thu, 27 Jul 2023 20:49:17 +0100 Subject: [PATCH 4/4] Starting VM's on developer machines now requires VPN access Choose the `prod` or `test` VPN depending on what kind of environment is being targeted. Signed-off-by: Pedro Algarvio --- tools/vm.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/vm.py b/tools/vm.py index ac03674cd68..c62f05750f1 100644 --- a/tools/vm.py +++ b/tools/vm.py @@ -649,7 +649,7 @@ def list_vms( for instance in instances: vm_state = instance.state["Name"] - ip_addr = instance.public_ip_address + ip_addr = instance.private_ip_address ami = instance.image_id vm_name = None for tag in instance.tags: @@ -812,7 +812,7 @@ class VM: ssh_config = textwrap.dedent( f"""\ Host {self.name} - Hostname {self.instance.public_ip_address or self.instance.private_ip_address} + Hostname {self.instance.private_ip_address} User {self.config.ssh_username} ControlMaster=no Compression=yes @@ -837,7 +837,7 @@ class VM: self.get_ec2_resource.cache_clear() if environment is None: - environment = "prod" + environment = tools.utils.SPB_ENVIRONMENT create_timeout = self.config.create_timeout create_timeout_progress = 0 @@ -928,11 +928,7 @@ class VM: if tag["Key"] != "Name": continue private_value = f"-{environment}-vpc-private-" - if started_in_ci and private_value in tag["Value"]: - subnets[subnet.id] = subnet.available_ip_address_count - break - public_value = f"-{environment}-vpc-public-" - if started_in_ci is False and public_value in tag["Value"]: + if private_value in tag["Value"]: subnets[subnet.id] = subnet.available_ip_address_count break if subnets: @@ -1104,7 +1100,7 @@ class VM: return error # Wait until we can SSH into the VM - host = self.instance.public_ip_address or self.instance.private_ip_address + host = self.instance.private_ip_address progress = create_progress_bar() connect_task = progress.add_task(