Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .config/mise.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,42 @@ checksum = "sha256:bbca37cc395c974ffa4893ee35819ad23ebb27426df87af92e93a9ec66ef8
size = 78583176
url = "https://dl.google.com/go/go1.24.6.linux-amd64.tar.gz"

[[tools.golangci-lint]]
version = "1.64.8"
backend = "aqua:golangci/golangci-lint"

[tools.golangci-lint.platforms.linux-x64]
checksum = "sha256:b6270687afb143d019f387c791cd2a6f1cb383be9b3124d241ca11bd3ce2e54e"
size = 12364828
url = "https://github.com/golangci/golangci-lint/releases/download/v1.64.8/golangci-lint-1.64.8-linux-amd64.tar.gz"

[[tools.gradle]]
version = "7.6.6"
backend = "aqua:gradle/gradle"

[tools.gradle.platforms.linux-x64]
checksum = "blake3:5cad8fc455b720b68a0bd2907d435e2919581708243f84f27845fe8812a09323"
size = 128439774
url = "https://github.com/gradle/gradle-distributions/releases/download/v7.6.6/gradle-7.6.6-bin.zip"

[[tools.java]]
version = "corretto-11.0.28.6.1"
backend = "core:java"

[tools.java.platforms.linux-x64]
checksum = "sha256:70734c46e0bbeb7f45b721756ba0b2f1f1e1ef85a11e10d5a488f06b257dadd9"
size = 195648709
url = "https://corretto.aws/downloads/resources/11.0.28.6.1/amazon-corretto-11.0.28.6.1-linux-x64.tar.gz"

[[tools.node]]
version = "20.19.5"
backend = "core:node"

[tools.node.platforms.linux-x64]
checksum = "sha256:4eba5fbe1fb10753bc06e42f001a91c5cec16798b7764a3e9257adc59af47fe1"
size = 47041607
url = "https://nodejs.org/dist/v20.19.5/node-v20.19.5-linux-x64.tar.gz"

[[tools.pulumi]]
version = "3.190.0"
backend = "aqua:pulumi/pulumi"
Expand Down
5 changes: 3 additions & 2 deletions .config/mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ _.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='GO_VERSION', default='latest') }}"
go = "{{ get_env(name='MISE_GO_VERSION', default='latest') }}"
node = '20'
python = '3.11.8'
dotnet = '8.0'
# Corretto version used as Java SE/OpenJDK version no longer offered
java = 'corretto-11'

# Executable tools
pulumi = "{{ get_env(name='PULUMI_VERSION', default='latest') }}"
pulumi = "{{ get_env(name='MISE_PULUMI_VERSION', default='latest') }}"
"github:pulumi/pulumictl" = 'latest'
"github:pulumi/schema-tools" = "latest"
gradle = '7.6'
golangci-lint = "1.64.8" # See note about about overrides if you need to customize this.

[settings]
experimental = true # Required for Go binaries (e.g. pulumictl).
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ jobs:
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
persist-credentials: false
- name: Install go
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
- name: Setup mise
uses: jdx/mise-action@v3
with:
# The versions of golangci-lint and setup-go here cross-depend and need to update together.
go-version: 1.23
# Either this action or golangci-lint needs to disable the cache
cache: false
github_token: ${{ secrets.GITHUB_TOKEN }}
cache_save: false # A different job handles caching our tools.
- name: disarm go:embed directives to enable lint
continue-on-error: true # this fails if there are no go:embed directives
run: |
Expand All @@ -40,5 +38,5 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
with:
version: v1.64.6
install-mode: none # Handled by mise.
working-directory: provider
9 changes: 6 additions & 3 deletions .github/workflows/upgrade-bridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,13 @@ jobs:
id: esc-secrets
name: Fetch secrets from ESC
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
- name: Setup tools
uses: ./.github/actions/setup-tools
- name: Setup mise
uses: jdx/mise-action@v3
with:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
github_token: ${{ secrets.GITHUB_TOKEN }}
cache_key: "mise-{{platform}}-{{file_hash}}"
# only saving the cache in the prerequisites job
cache_save: false
- name: Call upgrade provider action
if: github.event_name == 'workflow_dispatch'
uses: pulumi/pulumi-upgrade-provider-action@3c670a7cb92732324c8ccc17f7f9ef9dfca126d0 # v0.0.17
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/upgrade-provider.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,13 @@ jobs:
id: esc-secrets
name: Fetch secrets from ESC
uses: pulumi/esc-action@9eb774255b1a4afb7855678ae8d4a77359da0d9b
- name: Setup tools
uses: ./.github/actions/setup-tools
- name: Setup mise
uses: jdx/mise-action@v3
with:
tools: pulumictl, pulumicli, nodejs, python, dotnet, go, java
github_token: ${{ secrets.GITHUB_TOKEN }}
cache_key: "mise-{{platform}}-{{file_hash}}"
# only saving the cache in the prerequisites job
cache_save: false
- name: Install upgrade-provider
run: go install github.com/pulumi/upgrade-provider@${{ inputs.upgradeProviderVersion || 'main' }}
shell: bash
Expand Down
15 changes: 10 additions & 5 deletions scripts/get-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ set -euo pipefail
# e.g. go list -m -f '{{.GoVersion}}'

module_path="github.com/pulumi/pulumi/pkg/v3"
gomod="provider/go.mod"
go_mod_path="provider"
gomod="go.mod"

if [[ "$go_mod_path" != "" && "$go_mod_path" != "." ]]; then
gomod="$go_mod_path/$gomod"
fi

if [[ ! -f "$gomod" ]]; then
echo "missing $gomod" >&2
Expand All @@ -29,8 +34,8 @@ if [[ -z "${raw_version:-}" ]]; then
exit 1
fi

echo "PULUMI_VERSION=$raw_version"
export PULUMI_VERSION=$raw_version
echo "MISE_PULUMI_VERSION=$raw_version"
export MISE_PULUMI_VERSION=$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")
Expand All @@ -46,5 +51,5 @@ if [[ -z "${go_version:-}" ]]; then
exit 1
fi

echo "GO_VERSION=$go_version"
export GO_VERSION=$go_version
echo "MISE_GO_VERSION=$go_version"
export MISE_GO_VERSION=$go_version