From 83f91e9cf9df26523e59dd6715077031a6f74fea Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:58:05 -0800 Subject: [PATCH] Update GitHub Actions workflows. (#987) This PR was automatically generated by the update-workflows-single-bridged-provider workflow in the pulumi/ci-mgmt repo, from commit d2220e0e889ab11065b275e5259dbe14874b9710. --- .github/workflows/master.yml | 14 +++++++------- .github/workflows/prerelease.yml | 10 +++++----- .github/workflows/release.yml | 14 +++++++------- .github/workflows/resync-build.yml | 2 +- .github/workflows/run-acceptance-tests.yml | 8 ++++---- scripts/upstream.sh | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3b16a131a..57935e4ee 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -65,7 +65,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -171,7 +171,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -180,7 +180,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Echo Coverage Output Dir @@ -224,7 +224,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -233,7 +233,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -301,7 +301,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -395,7 +395,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c035bba3e..5a11c1823 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -66,7 +66,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -169,7 +169,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -178,7 +178,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -246,7 +246,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -322,7 +322,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3163f71f..b123455e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -146,7 +146,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - env: @@ -182,7 +182,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -191,7 +191,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -259,7 +259,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -318,7 +318,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Add SDK version tag @@ -368,7 +368,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index eca446bc1..fd629a739 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -69,7 +69,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 4f33c5a88..6ea1c469d 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -75,7 +75,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -194,7 +194,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI @@ -203,7 +203,7 @@ jobs: pulumi-version: ^3 - if: github.event_name == 'pull_request' name: Install Schema Tools - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/schema-tools - name: Build tfgen & provider binaries @@ -320,7 +320,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: repo: pulumi/pulumictl - name: Install Pulumi CLI diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 09d7ad85f..7a5ed4a55 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -97,7 +97,7 @@ start_rebase() { echo "Applying $patch" if ! git am --3way "$patch"; then echo - echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" + echo "Failed to apply ${patch}. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly" echo exit 1 fi @@ -145,7 +145,7 @@ apply() { if ! git apply --3way "$patch"; then cat <