From 90ee40ceb4b912817776080f53df7bb594044d75 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:12:26 -0700 Subject: [PATCH] Update GitHub Actions workflows. (#431) This PR was automatically generated by the rollout-single-native-provider-workflow workflow in the pulumi/ci-mgmt repo, from commit 50c552c6cdeb4eae0daff4be525adf0706f2513a. --- .github/workflows/build.yml | 33 +++++++++++++--------- .github/workflows/run-acceptance-tests.yml | 18 ++++++------ .github/workflows/weekly-pulumi-update.yml | 10 +++++-- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a67dac..8ff066f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,13 @@ on: - "**" workflow_dispatch: {} env: + AZURE_SIGNING_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }} + AZURE_SIGNING_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }} + AZURE_SIGNING_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }} + AZURE_SIGNING_KEY_VAULT_URI: ${{ secrets.AZURE_SIGNING_KEY_VAULT_URI }} + SKIP_SIGNING: ${{ secrets.AZURE_SIGNING_CLIENT_ID == '' && + secrets.AZURE_SIGNING_CLIENT_SECRET == '' && secrets.AZURE_SIGNING_TENANT_ID + == '' && secrets.AZURE_SIGNING_KEY_VAULT_URI == '' }} GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} PROVIDER: docker-build PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }} @@ -66,7 +73,7 @@ jobs: lfs: true - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -79,7 +86,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0 @@ -174,7 +181,7 @@ jobs: github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-gen-${{ env.PROVIDER}} - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: pulumi-${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -211,7 +218,7 @@ jobs: lfs: true - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -224,7 +231,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: @@ -318,7 +325,7 @@ jobs: - name: Tar SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -354,7 +361,7 @@ jobs: lfs: true - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -367,7 +374,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: @@ -470,7 +477,7 @@ jobs: lfs: true - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -492,7 +499,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 with: @@ -528,7 +535,7 @@ jobs: lfs: true - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Checkout Scripts Repo @@ -547,7 +554,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: @@ -617,7 +624,7 @@ jobs: run: git grep -l 'go:embed' -- provider | xargs --no-run-if-empty sed -i 's/go:embed/ goembed/g' - name: golangci-lint provider pkg - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1 + uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0 with: version: ${{ env.GOLANGCI_LINT_VERSION }} args: -c ../.golangci.yml diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 585f1d3..1a06d4e 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -81,7 +81,7 @@ jobs: ref: ${{ env.PR_COMMIT_SHA }} - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -94,7 +94,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - if: github.event_name == 'pull_request' name: Install Schema Tools uses: jaxxstorm/action-install-gh-release@cd6b2b78ad38bdd294341cda064ec0692b06215b # v1.14.0 @@ -189,7 +189,7 @@ jobs: github.workspace}}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-gen-${{ env.PROVIDER}} - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: pulumi-${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -230,7 +230,7 @@ jobs: ref: ${{ env.PR_COMMIT_SHA }} - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -243,7 +243,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: @@ -337,7 +337,7 @@ jobs: - name: Tar SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -377,7 +377,7 @@ jobs: ref: ${{ env.PR_COMMIT_SHA }} - id: version name: Set Provider Version - uses: pulumi/provider-version-action@0391d47b9b0d865d33dd0a295b1fcf9f7021dd4c # v1.5.3 + uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0 with: set-env: PROVIDER_VERSION - name: Install Go @@ -390,7 +390,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup Node uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: @@ -522,7 +522,7 @@ jobs: run: git grep -l 'go:embed' -- provider | xargs --no-run-if-empty sed -i 's/go:embed/ goembed/g' - name: golangci-lint provider pkg - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1 + uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0 with: version: ${{ env.GOLANGCI_LINT_VERSION }} args: -c ../.golangci.yml diff --git a/.github/workflows/weekly-pulumi-update.yml b/.github/workflows/weekly-pulumi-update.yml index e3090d5..735feba 100644 --- a/.github/workflows/weekly-pulumi-update.yml +++ b/.github/workflows/weekly-pulumi-update.yml @@ -64,7 +64,7 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@c7fad9e2f0b79653172b36538b8b34b3c0291952 # v6.0.0 + uses: pulumi/actions@13b8b7177d6fb736766875dac9b78aab07bd785f # v6.0.1 - name: Setup DotNet uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0 with: @@ -127,10 +127,14 @@ jobs: - name: Create PR id: create-pr if: steps.gomod.outputs.changes != 0 - run: | + run: > ver=$(cat .pulumi.version) + msg="Automated upgrade: bump pulumi/pulumi to ${ver}" - gh pr create -t "$msg" -b "$msg" -B main + + # See https://github.com/cli/cli/issues/6485#issuecomment-2560935183 for --head workaround + + gh pr create -t "$msg" -b "$msg" --head $(git branch --show-current) env: GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} name: weekly-pulumi-update