diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml index caa8b79dc54..1f228fd1822 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.1 + default: 0.12.3 outputs: version: diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml index ab405a156a1..ad788929cf9 100644 --- a/.github/workflows/build-deps-onedir.yml +++ b/.github/workflows/build-deps-onedir.yml @@ -21,7 +21,7 @@ on: relenv-version: required: false type: string - default: 0.12.1 + default: 0.12.3 description: The version of relenv to use python-version-linux: required: false diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 9e21e903c55..2b1b758b42f 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -21,7 +21,7 @@ on: relenv-version: required: false type: string - default: 0.12.1 + default: 0.12.3 description: The version of relenv to use python-version-linux: required: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdf6dbdfbd5..a18e21fcc5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -448,7 +448,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" @@ -466,7 +466,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9ca0ed5dd76..8291efe30fa 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -506,7 +506,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" @@ -524,7 +524,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index c1c515f890d..fda566fbb3e 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -491,7 +491,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" @@ -509,7 +509,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index ddc90088460..53f5fd62454 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -502,7 +502,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" @@ -520,7 +520,7 @@ 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.1" + relenv-version: "0.12.3" python-version-linux: "3.10.11" python-version-macos: "3.10.11" python-version-windows: "3.10.11" diff --git a/changelog/64192.fixed.md b/changelog/64192.fixed.md index 505a945aa7c..c0433045506 100644 --- a/changelog/64192.fixed.md +++ b/changelog/64192.fixed.md @@ -1 +1 @@ -Add a `.pth` to the Salt onedir env to ensure packages in extras are importable. Bump relenv to 0.12.0. +Add a `.pth` to the Salt onedir env to ensure packages in extras are importable. Bump relenv to 0.12.3. diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 5acd767923d..ec3d939fe03 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,4 +1,4 @@ python_version_linux: "3.10.11" python_version_macos: "3.10.11" python_version_windows: "3.10.11" -relenv_version: "0.12.1" +relenv_version: "0.12.3"