diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml index 1f228fd1822f..50ade327764a 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 6197ebc03333..c0371734bb7e 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 972176c8cee8..bc89e8bb1e44 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 0b10e20ec80b..5a07d1458505 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -463,8 +463,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 @@ -479,8 +479,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 @@ -491,8 +491,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 @@ -503,8 +503,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 @@ -515,8 +515,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 @@ -527,8 +527,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 @@ -543,7 +543,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 }} @@ -561,7 +561,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 }} @@ -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: ${{ 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 }} @@ -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: ${{ 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 }} @@ -615,7 +615,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 }} @@ -633,7 +633,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 }} @@ -651,7 +651,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 }} @@ -669,7 +669,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 }} @@ -687,7 +687,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 }} @@ -705,7 +705,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 }} @@ -723,7 +723,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 }} @@ -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: ${{ 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 }} @@ -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: ${{ 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 }} @@ -777,7 +777,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 }} @@ -795,7 +795,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 }} @@ -813,7 +813,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 }} @@ -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: ${{ 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 }} @@ -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: ${{ 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 }} @@ -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: ${{ 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 }} @@ -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: ${{ 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 }} @@ -904,7 +904,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' }} @@ -922,7 +922,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' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -958,7 +958,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' }} @@ -976,7 +976,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' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1138,7 +1138,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' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1174,7 +1174,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' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -1264,7 +1264,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' }} @@ -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: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} @@ -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: ${{ 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 37dc351d4a2b..2aec20bf628e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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-salt-onedir: name: Build Salt Onedir @@ -525,8 +525,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 @@ -537,8 +537,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 @@ -549,8 +549,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 @@ -561,8 +561,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 @@ -576,8 +576,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 @@ -595,7 +595,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 }} @@ -613,7 +613,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 }} @@ -631,7 +631,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 }} @@ -649,7 +649,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 }} @@ -667,7 +667,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 }} @@ -685,7 +685,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 }} @@ -703,7 +703,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 }} @@ -721,7 +721,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 }} @@ -739,7 +739,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 }} @@ -757,7 +757,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 }} @@ -775,7 +775,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 }} @@ -793,7 +793,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 }} @@ -811,7 +811,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 }} @@ -829,7 +829,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 }} @@ -847,7 +847,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 }} @@ -865,7 +865,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 }} @@ -883,7 +883,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 }} @@ -901,7 +901,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 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 }} @@ -937,7 +937,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 }} @@ -956,7 +956,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 @@ -974,7 +974,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 @@ -992,7 +992,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 @@ -1010,7 +1010,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 @@ -1028,7 +1028,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 @@ -1046,7 +1046,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 @@ -1064,7 +1064,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 @@ -1082,7 +1082,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 @@ -1100,7 +1100,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 @@ -1118,7 +1118,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 @@ -1136,7 +1136,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 @@ -1154,7 +1154,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 @@ -1172,7 +1172,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 @@ -1190,7 +1190,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 @@ -1208,7 +1208,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 @@ -1226,7 +1226,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 @@ -1244,7 +1244,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 @@ -1262,7 +1262,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 @@ -1280,7 +1280,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 @@ -1298,7 +1298,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 @@ -1316,7 +1316,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 @@ -1334,7 +1334,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 @@ -1352,7 +1352,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 fa0a019a4967..cdd66daf1af6 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 7cf8de379560..7c516300ff12 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -499,8 +499,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 @@ -515,8 +515,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 @@ -527,8 +527,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 @@ -539,8 +539,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 @@ -551,8 +551,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 @@ -563,8 +563,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 @@ -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/staging.yml b/.github/workflows/staging.yml index 76fc10c03ca0..456aac0a00f4 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -499,8 +499,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 @@ -515,8 +515,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 @@ -527,8 +527,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 @@ -539,8 +539,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 @@ -551,8 +551,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 @@ -566,8 +566,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 @@ -585,7 +585,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 }} @@ -603,7 +603,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 }} @@ -621,7 +621,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 }} @@ -639,7 +639,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 }} @@ -657,7 +657,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 }} @@ -675,7 +675,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 }} @@ -693,7 +693,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 }} @@ -711,7 +711,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 }} @@ -729,7 +729,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 }} @@ -747,7 +747,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 }} @@ -765,7 +765,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 }} @@ -783,7 +783,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 }} @@ -801,7 +801,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 }} @@ -819,7 +819,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 }} @@ -837,7 +837,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 }} @@ -855,7 +855,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 }} @@ -873,7 +873,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 }} @@ -891,7 +891,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 }} @@ -909,7 +909,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 }} @@ -927,7 +927,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 }} @@ -946,7 +946,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 @@ -964,7 +964,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 @@ -982,7 +982,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 @@ -1000,7 +1000,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 @@ -1018,7 +1018,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 @@ -1036,7 +1036,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 @@ -1054,7 +1054,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 @@ -1072,7 +1072,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 @@ -1090,7 +1090,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 @@ -1108,7 +1108,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 @@ -1126,7 +1126,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 @@ -1144,7 +1144,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 @@ -1162,7 +1162,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 @@ -1180,7 +1180,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 @@ -1198,7 +1198,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 @@ -1216,7 +1216,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 @@ -1234,7 +1234,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 @@ -1252,7 +1252,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 @@ -1270,7 +1270,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 @@ -1288,7 +1288,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 @@ -1306,7 +1306,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 @@ -1324,7 +1324,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 @@ -1342,7 +1342,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 @@ -2104,7 +2104,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 @@ -2123,7 +2123,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 @@ -2142,7 +2142,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 @@ -2161,7 +2161,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 @@ -2180,7 +2180,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 @@ -2199,7 +2199,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 @@ -2218,7 +2218,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 @@ -2237,7 +2237,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 @@ -2256,7 +2256,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 @@ -2275,7 +2275,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 @@ -2294,7 +2294,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 @@ -2313,7 +2313,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 @@ -2332,7 +2332,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 @@ -2351,7 +2351,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 @@ -2370,7 +2370,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 @@ -2389,7 +2389,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 @@ -2408,7 +2408,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 @@ -2427,7 +2427,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 @@ -2446,7 +2446,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 @@ -2465,7 +2465,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 @@ -2484,7 +2484,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 @@ -2503,7 +2503,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 @@ -2522,7 +2522,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 @@ -2541,7 +2541,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 @@ -2560,7 +2560,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 @@ -2579,7 +2579,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 @@ -2598,7 +2598,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 @@ -2617,7 +2617,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 @@ -2636,7 +2636,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 @@ -2656,7 +2656,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 @@ -2675,7 +2675,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 @@ -2694,7 +2694,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/64718.security.md b/changelog/64718.security.md new file mode 100644 index 000000000000..b40aef1ad857 --- /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/changelog/64719.security.md b/changelog/64719.security.md new file mode 100644 index 000000000000..3476499d3d74 --- /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 2e07c02a506c..10895f8e79eb 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,4 +1,4 @@ -python_version: "3.10.11" -relenv_version: "0.12.3" +python_version: "3.10.12" +relenv_version: "0.13.2" release-branches: - "3006.x" diff --git a/pkg/macos/build_python.sh b/pkg/macos/build_python.sh index be179b7b1662..7d65dca843b8 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/tests/conftest.py b/pkg/tests/conftest.py index 5eba84bb4aa2..b7d908f32d58 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") diff --git a/pkg/windows/build.ps1 b/pkg/windows/build.ps1 index 6c5cac2ac172..ac273a6c163d 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 e91f41fea00f..90a2b053a924 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")] diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 345419d5c786..73a1eac3e911 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/cloud.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.10/linux.txt # requests diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index c678b658c7ce..087fd46d8381 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -51,7 +51,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index beb2a1e0de11..3b5205163fa6 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -12,7 +12,7 @@ autocommand==2.2.2 # jaraco.text babel==2.12.1 # via sphinx -certifi==2023.5.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 542a3dfa9919..bc76ccd73b40 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -48,7 +48,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index b7ab4f2d0f31..5690b5585f87 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -59,7 +59,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.10/pkgtests-windows.txt b/requirements/static/ci/py3.10/pkgtests-windows.txt index b7f264f1fdcc..22c13fd58894 100644 --- a/requirements/static/ci/py3.10/pkgtests-windows.txt +++ b/requirements/static/ci/py3.10/pkgtests-windows.txt @@ -12,7 +12,7 @@ attrs==23.1.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via diff --git a/requirements/static/ci/py3.10/pkgtests.txt b/requirements/static/ci/py3.10/pkgtests.txt index e21f20816e2c..57b6b8a05f62 100644 --- a/requirements/static/ci/py3.10/pkgtests.txt +++ b/requirements/static/ci/py3.10/pkgtests.txt @@ -12,7 +12,7 @@ attrs==23.1.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index 0641eb7443d9..e4fa0854be27 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -14,7 +14,7 @@ botocore==1.29.152 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.07.22 # via requests charset-normalizer==3.1.0 # via requests diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index f0f163a7dc7c..590280715c11 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -40,7 +40,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 705200c52cfc..a0a7f27af37d 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/cloud.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.11/linux.txt # requests diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index fd5deacb7a07..d756eb68aba6 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -51,7 +51,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index a9b55617b937..78f669eae251 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -12,7 +12,7 @@ autocommand==2.2.2 # jaraco.text babel==2.12.1 # via sphinx -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.11/linux.txt # requests diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 3bc3a8c2e960..a13eaeecda89 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -48,7 +48,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 19be3c22072b..810055c9fbc7 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -59,7 +59,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/pkgtests-windows.txt b/requirements/static/ci/py3.11/pkgtests-windows.txt index e64a2368a809..8560822cabfa 100644 --- a/requirements/static/ci/py3.11/pkgtests-windows.txt +++ b/requirements/static/ci/py3.11/pkgtests-windows.txt @@ -12,7 +12,7 @@ attrs==23.1.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via diff --git a/requirements/static/ci/py3.11/pkgtests.txt b/requirements/static/ci/py3.11/pkgtests.txt index f7b7a0278702..bc1a77a94085 100644 --- a/requirements/static/ci/py3.11/pkgtests.txt +++ b/requirements/static/ci/py3.11/pkgtests.txt @@ -12,7 +12,7 @@ attrs==23.1.0 # pytest-system-statistics autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt index 1776cc02da78..e0cac58d78ae 100644 --- a/requirements/static/ci/py3.11/tools.txt +++ b/requirements/static/ci/py3.11/tools.txt @@ -14,7 +14,7 @@ botocore==1.29.152 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.07.22 # via requests charset-normalizer==3.1.0 # via requests diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index bcfeb1e68c4a..e48d0e253dff 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -40,7 +40,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index 2e23fd871952..04e2fdbddd9e 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.8/linux.txt # -r requirements/static/ci/cloud.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.8/linux.txt # requests diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 4351387d324f..7c1392dc52f6 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -12,7 +12,7 @@ autocommand==2.2.2 # jaraco.text babel==2.12.1 # via sphinx -certifi==2023.5.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 2db58e98605e..f79f6bb47336 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -48,7 +48,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.8/freebsd.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index 392df3942ab5..1ba2c692c362 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -59,7 +59,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.8/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index b49a4ddbc044..64143918b8b7 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -40,7 +40,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.8/windows.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index bd93f13e1fe4..43141d5c4523 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/cloud.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/py3.9/linux.txt # requests diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index e5ca5c25c3b1..5a7a01cc8dff 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -51,7 +51,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index b435d3d68aa8..96162a63eb80 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -12,7 +12,7 @@ autocommand==2.2.2 # jaraco.text babel==2.12.1 # via sphinx -certifi==2023.5.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 2739f18762f8..d1e2e7551f6b 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -48,7 +48,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 76b5486ab888..58334b40dfe0 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -59,7 +59,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index b9e076ed2d5a..2bde36db4826 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -14,7 +14,7 @@ botocore==1.29.152 # via # boto3 # s3transfer -certifi==2023.5.7 +certifi==2023.07.22 # via requests charset-normalizer==3.1.0 # via requests diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 7d322ae64893..ad690f4bb9c4 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -40,7 +40,7 @@ cachetools==5.3.1 # via google-auth cassandra-driver==3.28.0 # via -r requirements/static/ci/common.in -certifi==2023.5.7 +certifi==2023.07.22 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 21dce6714533..82789c097dbc 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 # via -r requirements/darwin.txt autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 4ad7475dfdaa..abfc465502d9 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index a1e5c82a9188..817f0b2dd43e 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index a41f27256992..b68ab903142d 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 929d79731c72..988bdc24cb2c 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 # via -r requirements/darwin.txt autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index d7fc4f501450..580e387e9d7f 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 8c958bfa70cc..a17d66ddc0d8 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 24e340c4ac59..d58e456b0462 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.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 c3948f2b5051..e2a9fdcec1fa 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index f45aad3c1c0b..ca2409f47a0d 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 8e734824bd1a..e56e1ee652d6 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.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 754a62aaaac1..b5aece2f3ec0 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -8,7 +8,7 @@ apache-libcloud==3.7.0 # via -r requirements/darwin.txt autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index f32bed564246..b1d23d653e92 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 035b3daf23a5..0df13905ad0a 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via requests cffi==1.15.1 # via cryptography diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index bfb3096c8035..52de854fd22c 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -6,7 +6,7 @@ # autocommand==2.2.2 # via jaraco.text -certifi==2023.5.7 +certifi==2023.07.22 # via # -r requirements/windows.txt # requests diff --git a/tools/vm.py b/tools/vm.py index ac03674cd681..c62f05750f18 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 @@ def write_ssh_config(self): 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 @@ def create( 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 @@ def create( 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 @@ def create( 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(