From baa8bcce840158b3bcb7d660e0e18802706642fc Mon Sep 17 00:00:00 2001 From: Charles Treatman Date: Mon, 21 Oct 2024 15:45:29 -0500 Subject: [PATCH] chore: use fork of upgrade-action so we can specify go version (#219) --- .github/workflows/upgrade-bridge.yml | 10 ++++++++-- .github/workflows/upgrade-provider.yml | 5 ++++- go.work | 4 +--- provider/go.mod | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index b7362cef..fc159795 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.yml @@ -42,7 +42,9 @@ jobs: ref: ${{ github.ref_name }} - name: Call upgrade provider action if: github.event_name == 'workflow_dispatch' - uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 + uses: equinix-labs/pulumi-upgrade-provider-action@parameterize-go-version + #TODO: switch back to upstream when it supports configurable go version + #uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: bridge email: noreply@github.com @@ -52,9 +54,12 @@ jobs: pr-reviewers: ${{ inputs.pr-reviewers }} pr-description: ${{ inputs.pr-description }} pr-title-prefix: "feat: " + go-version-file: provider/go.mod - name: Call upgrade provider action if: github.event_name == 'repository_dispatch' - uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 + uses: equinix-labs/pulumi-upgrade-provider-action@parameterize-go-version + #TODO: switch back to upstream when it supports configurable go version + #uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: bridge email: noreply@github.com @@ -63,3 +68,4 @@ jobs: target-bridge-version: ${{ github.event.client_payload.target-bridge-version }} pr-reviewers: ${{ github.event.client_payload.pr-reviewers }} pr-description: ${{ github.event.client_payload.pr-description }} + go-version-file: provider/go.mod diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml index 3aa09d1c..108efbd2 100644 --- a/.github/workflows/upgrade-provider.yml +++ b/.github/workflows/upgrade-provider.yml @@ -31,10 +31,13 @@ jobs: run: | echo "version=$(cat .pulumi-java-gen.version)" >> "$GITHUB_OUTPUT" - name: Call upgrade provider action - uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 + uses: equinix-labs/pulumi-upgrade-provider-action@parameterize-go-version + #TODO: switch back to upstream when it supports configurable go version + #uses: pulumi/pulumi-upgrade-provider-action@v0.0.12 with: kind: provider email: noreply@github.com username: GitHub pr-title-prefix: "feat: " target-java-version: ${{ steps.pulumi-java.outputs.version }} + go-version-file: provider/go.mod diff --git a/go.work b/go.work index e5eb1ad1..9176a921 100644 --- a/go.work +++ b/go.work @@ -1,6 +1,4 @@ -go 1.22.0 - -toolchain go1.22.6 +go 1.22.6 use ( ./examples diff --git a/provider/go.mod b/provider/go.mod index 9ca1ae67..e6e54da3 100644 --- a/provider/go.mod +++ b/provider/go.mod @@ -1,8 +1,8 @@ module github.com/equinix/pulumi-equinix/provider -go 1.22.0 +go 1.22.6 -toolchain go1.22.3 +toolchain go1.22.6 replace ( github.com/equinix/terraform-provider-equinix => ../upstream