diff --git a/.config/mise.toml b/.config/mise.toml index c59d9f6..41ac5d7 100644 --- a/.config/mise.toml +++ b/.config/mise.toml @@ -8,7 +8,7 @@ _.source = "{{config_root}}/scripts/get-versions.sh" # Runtimes # TODO: we may not need `get_env` once https://github.com/jdx/mise/discussions/6339 is fixed -go = "{{ get_env(name='MISE_GO_VERSION', default='latest') }}" +go = "{{ get_env(name='GO_VERSION_MISE', default='latest') }}" node = '20' python = '3.11.8' dotnet = '8.0' @@ -16,7 +16,7 @@ dotnet = '8.0' java = 'corretto-11' # Executable tools -pulumi = "{{ get_env(name='MISE_PULUMI_VERSION', default='latest') }}" +pulumi = "{{ get_env(name='PULUMI_VERSION_MISE', default='latest') }}" "github:pulumi/pulumictl" = 'latest' "github:pulumi/schema-tools" = "latest" gradle = '7.6' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 598640c..7c052c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,6 +127,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -302,6 +303,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 16fc955..d530c45 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -116,6 +116,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -291,6 +292,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit ${{ matrix.language }} SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36eeecc..2f5ff53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -119,6 +119,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -294,6 +295,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 25dc367..f1ecb18 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -147,6 +147,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == @@ -326,6 +327,7 @@ jobs: sdk/go/**/pulumiUtilities.go sdk/nodejs/package.json sdk/python/pyproject.toml + sdk/java/build.gradle - name: Commit SDK changes for Renovate if: failure() && steps.worktreeClean.outcome == 'failure' && contains(github.actor, 'renovate') && github.event_name == diff --git a/scripts/get-versions.sh b/scripts/get-versions.sh index 1c231f5..5cb1ca2 100755 --- a/scripts/get-versions.sh +++ b/scripts/get-versions.sh @@ -34,8 +34,8 @@ if [[ -z "${raw_version:-}" ]]; then exit 1 fi -echo "MISE_PULUMI_VERSION=$raw_version" -export MISE_PULUMI_VERSION=$raw_version +echo "PULUMI_VERSION_MISE=$raw_version" +export PULUMI_VERSION_MISE=$raw_version # Prefer the toolchain directive if present, otherwise fall back to the `go` version line go_toolchain=$(awk '/^toolchain[[:space:]]+go[0-9]/{ print $2; exit }' "$gomod") @@ -51,5 +51,5 @@ if [[ -z "${go_version:-}" ]]; then exit 1 fi -echo "MISE_GO_VERSION=$go_version" -export MISE_GO_VERSION=$go_version +echo "GO_VERSION_MISE=$go_version" +export GO_VERSION_MISE=$go_version