Skip to content

Commit 9d67f35

Browse files
authored
Remove mise.toml override for pulumictl (#420)
`pulumictl` override in `mise.toml` is no longer required since it is provided by `.config/mise.toml`.
1 parent 4be0508 commit 9d67f35

20 files changed

+134
-192
lines changed

.config/mise.lock

Lines changed: 0 additions & 92 deletions
This file was deleted.

.config/mise.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PULUMI_HOME = "{{config_root}}/.pulumi"
88
[tools]
99

1010
# Runtimes
11-
# TODO: we may not need `get_env` once https://github.com/jdx/mise/discussions/6339 is fixed
11+
# TODO: we may not need 'get_env' once https://github.com/jdx/mise/discussions/6339 is fixed
1212
go = "{{ get_env(name='GO_VERSION_MISE', default='latest') }}"
1313
node = '20.19.5'
1414
python = '3.11.8'
@@ -18,12 +18,12 @@ java = 'corretto-11'
1818

1919
# Executable tools
2020
pulumi = "{{ get_env(name='PULUMI_VERSION_MISE', default='latest') }}"
21-
"github:pulumi/pulumictl" = 'latest'
22-
"github:pulumi/schema-tools" = "latest"
23-
gradle = '7.6'
21+
"github:pulumi/pulumictl" = '0.0.50'
22+
"github:pulumi/schema-tools" = "0.6.0"
23+
"aqua:gradle/gradle-distributions" = '7.6.6'
2424
golangci-lint = "1.64.8" # See note about about overrides if you need to customize this.
2525
"npm:yarn" = "1.22.22"
2626

2727
[settings]
2828
experimental = true # Required for Go binaries (e.g. pulumictl).
29-
lockfile = true
29+
lockfile = false

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jetpackio/devbox:latest
1+
FROM jetpackio/devbox:latest@sha256:293d6d0a33205e88550198835e68bcff65a2e33d143857ad92c6c888e6a75ad7
22

33
# Installing your devbox project
44
WORKDIR /code

.github/workflows/build_provider.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
id-token: write # For ESC secrets.
4040
steps:
4141
- name: Checkout Repo
42-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4343
with:
4444
persist-credentials: false
4545
- env:
@@ -53,16 +53,16 @@ jobs:
5353
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
5454
# Without ldid cross-compiling Node binaries on a Linux worker intended to work on darwin-arm64 fails to sign the
5555
# binaries properly and they do not work as expected. See https://github.com/pulumi/pulumi-awsx/issues/1490
56-
- uses: MOZGIII/install-ldid-action@v1
56+
- uses: MOZGIII/install-ldid-action@d5ab465f3a66a4d60a59882b935eb30e18e8d043 # v1
5757
with:
5858
tag: v2.1.5-procursus2
5959
- name: Setup mise
60-
uses: jdx/mise-action@v3
60+
uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3
61+
env:
62+
MISE_FETCH_REMOTE_VERSIONS_TIMEOUT: 30s
6163
with:
62-
# Latest working version. See https://github.com/jdx/mise/discussions/6781
63-
version: 2025.10.16
64-
github_token: ${{ secrets.GITHUB_TOKEN }}
65-
cache_key: "mise-{{platform}}-{{file_hash}}"
64+
version: 2025.11.6
65+
github_token: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
6666
# only saving the cache in the prerequisites job
6767
cache_save: false
6868
# Based on https://github.com/actions/cache/blob/main/examples.md#go---modules
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
echo "path=$(go env GOMODCACHE)" >> "${GITHUB_OUTPUT}"
7979
- name: Go Cache
80-
uses: actions/cache@v4
80+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
8181
with:
8282
path: |
8383
${{ steps.gocache.outputs.path }}

.github/workflows/build_sdk.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
PULUMI_API: https://api.pulumi-staging.io
1414
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
1515
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
16+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
1617
TF_APPEND_USER_AGENT: pulumi
1718
PROVIDER_VERSION: ${{ inputs.version }}
1819

@@ -35,7 +36,7 @@ jobs:
3536
id-token: write # For ESC secrets.
3637
steps:
3738
- name: Checkout Repo
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
39+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3940
with:
4041
persist-credentials: false
4142
- env:
@@ -54,17 +55,17 @@ jobs:
5455
.pulumi/examples-cache
5556
key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
5657
- name: Setup mise
57-
uses: jdx/mise-action@v3
58+
uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3
59+
env:
60+
MISE_FETCH_REMOTE_VERSIONS_TIMEOUT: 30s
5861
with:
59-
# Latest working version. See https://github.com/jdx/mise/discussions/6781
60-
version: 2025.10.16
61-
github_token: ${{ secrets.GITHUB_TOKEN }}
62-
cache_key: "mise-{{platform}}-{{file_hash}}"
62+
version: 2025.11.6
63+
github_token: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
6364
# only saving the cache in the prerequisites job
6465
cache_save: false
6566
- name: Setup Go Cache
6667
if: matrix.language == 'go' || contains(matrix.language, 'go')
67-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
68+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6
6869
with:
6970
cache-dependency-path: |
7071
provider/*.sum
@@ -97,10 +98,6 @@ jobs:
9798
sdk/nodejs/package.json
9899
sdk/python/pyproject.toml
99100
sdk/java/build.gradle
100-
**/mise.lock
101-
**/.config/mise.lock
102-
**/mise.*.lock
103-
**/.config/mise.*.lock
104101
- name: Commit ${{ matrix.language }} SDK changes for Renovate
105102
# If the worktree is dirty and this is a Renovate PR to bump
106103
# dependencies, commit the updated SDK and push it back to the PR. The

.github/workflows/license.yml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,38 @@ env:
1010
PULUMI_API: https://api.pulumi-staging.io
1111
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
1212
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
13+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
1314
TF_APPEND_USER_AGENT: pulumi
1415

1516
jobs:
1617
license_check:
1718
name: License Check
1819
runs-on: ubuntu-latest
20+
permissions:
21+
contents: read
22+
pull-requests: write
23+
id-token: write # For ESC secrets.
1924
steps:
2025
- name: Checkout Repo
21-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2227
with:
23-
persist-credentials: false
28+
persist-credentials: false
29+
- env:
30+
ESC_ACTION_ENVIRONMENT: imports/github-secrets
31+
ESC_ACTION_EXPORT_ENVIRONMENT_VARIABLES: "false"
32+
ESC_ACTION_OIDC_AUTH: "true"
33+
ESC_ACTION_OIDC_ORGANIZATION: pulumi
34+
ESC_ACTION_OIDC_REQUESTED_TOKEN_TYPE: urn:pulumi:token-type:access_token:organization
35+
id: esc-secrets
36+
name: Fetch secrets from ESC
37+
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
2438
- name: Setup mise
25-
uses: jdx/mise-action@v3
39+
uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3
40+
env:
41+
MISE_FETCH_REMOTE_VERSIONS_TIMEOUT: 30s
2642
with:
27-
# Latest working version. See https://github.com/jdx/mise/discussions/6781
28-
version: 2025.10.16
29-
github_token: ${{ secrets.GITHUB_TOKEN }}
30-
cache_key: "mise-{{platform}}-{{file_hash}}"
43+
version: 2025.11.6
44+
github_token: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
3145
# only saving the cache in the prerequisites job
3246
cache_save: false
3347
- run: make prepare_local_workspace

.github/workflows/lint.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,38 @@ env:
1010
PULUMI_API: https://api.pulumi-staging.io
1111
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
1212
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
13+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
1314
TF_APPEND_USER_AGENT: pulumi
1415

1516
jobs:
1617
lint:
1718
name: lint
1819
runs-on: ubuntu-latest
20+
permissions:
21+
contents: read
22+
pull-requests: write
23+
id-token: write # For ESC secrets.
1924
steps:
2025
- name: Checkout Repo
21-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2227
with:
23-
persist-credentials: false
28+
persist-credentials: false
29+
- env:
30+
ESC_ACTION_ENVIRONMENT: imports/github-secrets
31+
ESC_ACTION_EXPORT_ENVIRONMENT_VARIABLES: "false"
32+
ESC_ACTION_OIDC_AUTH: "true"
33+
ESC_ACTION_OIDC_ORGANIZATION: pulumi
34+
ESC_ACTION_OIDC_REQUESTED_TOKEN_TYPE: urn:pulumi:token-type:access_token:organization
35+
id: esc-secrets
36+
name: Fetch secrets from ESC
37+
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
2438
- name: Setup mise
25-
uses: jdx/mise-action@v3
39+
uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3
40+
env:
41+
MISE_FETCH_REMOTE_VERSIONS_TIMEOUT: 30s
2642
with:
27-
# Latest working version. See https://github.com/jdx/mise/discussions/6781
28-
version: 2025.10.16
29-
github_token: ${{ secrets.GITHUB_TOKEN }}
43+
version: 2025.11.6
44+
github_token: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
3045
cache_save: false # A different job handles caching our tools.
3146
- name: disarm go:embed directives to enable lint
3247
continue-on-error: true # this fails if there are no go:embed directives

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
PULUMI_API: https://api.pulumi-staging.io
55
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
66
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
7+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
78
TF_APPEND_USER_AGENT: pulumi
89

910
jobs:
@@ -88,7 +89,7 @@ jobs:
8889
id-token: write # For ESC secrets.
8990
steps:
9091
- name: Checkout Repo
91-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
92+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
9293
with:
9394
persist-credentials: false
9495
- env:

.github/workflows/prerelease.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
PULUMI_API: https://api.pulumi-staging.io
66
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
77
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
8+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
89
TF_APPEND_USER_AGENT: pulumi
910

1011
jobs:

.github/workflows/prerequisites.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ env:
2323
PULUMI_API: https://api.pulumi-staging.io
2424
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
2525
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
26+
PULUMI_PULUMI_ENABLE_JOURNALING: "true"
2627
TF_APPEND_USER_AGENT: pulumi
2728

2829
jobs:
@@ -37,7 +38,7 @@ jobs:
3738
version: ${{ steps.provider-version.outputs.version }}
3839
steps:
3940
- name: Checkout Repo
40-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
41+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4142
with:
4243
persist-credentials: false
4344
- env:
@@ -49,7 +50,7 @@ jobs:
4950
id: esc-secrets
5051
name: Fetch secrets from ESC
5152
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
52-
- uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0
53+
- uses: pulumi/provider-version-action@3a647064cf4697c7c6352b9a1d9e554450cbe957 # v1.6.1
5354
id: provider-version
5455
with:
5556
major-version: 1
@@ -61,16 +62,16 @@ jobs:
6162
.pulumi/examples-cache
6263
key: ${{ runner.os }}-${{ hashFiles('provider/go.sum') }}
6364
- name: Setup mise
64-
uses: jdx/mise-action@v3
65+
uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3
66+
env:
67+
MISE_FETCH_REMOTE_VERSIONS_TIMEOUT: 30s
6568
with:
66-
# Latest working version. See https://github.com/jdx/mise/discussions/6781
67-
version: 2025.10.16
68-
github_token: ${{ secrets.GITHUB_TOKEN }}
69-
cache_key: "mise-{{platform}}-{{file_hash}}"
69+
version: 2025.11.6
70+
github_token: ${{ steps.esc-secrets.outputs.PULUMI_BOT_TOKEN }}
7071
# only saving the cache in the prerequisites job
7172
cache_save: true
7273
- name: Setup Go Cache
73-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
74+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6
7475
with:
7576
cache-dependency-path: |
7677
provider/*.sum

0 commit comments

Comments
 (0)