From 6cef7e74e328f4d104032b58126c084ca4ffc2bd Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 9 Feb 2024 22:41:26 -0800 Subject: [PATCH] Update GitHub Actions workflows. (#3414) This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 00ba6bcffc91771fa98a01b69c41df697f956e01. --- .github/workflows/check-upstream-upgrade.yml | 2 +- .github/workflows/command-dispatch.yml | 2 +- .github/workflows/community-moderation.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/master.yml | 41 ++++++++++++-------- .github/workflows/nightly-test.yml | 26 ++++++++----- .github/workflows/prerelease.yml | 31 +++++++++------ .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 39 ++++++++++++------- .github/workflows/release_command.yml | 2 +- .github/workflows/resync-build.yml | 7 ++-- .github/workflows/run-acceptance-tests.yml | 26 ++++++++----- scripts/upstream.sh | 4 +- 13 files changed, 112 insertions(+), 74 deletions(-) diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 96ae8c7cbfe..efc0ee9f237 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -15,7 +15,7 @@ jobs: sdk/go.sum go-version: 1.21.x - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Unshallow clone for tags diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index cfb2a3c1ac1..935a5ea2de5 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - uses: peter-evans/slash-command-dispatch@v2 diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml index 1305961092c..2a147099362 100644 --- a/.github/workflows/community-moderation.yml +++ b/.github/workflows/community-moderation.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - id: schema_changed diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9313f5f3f5b..dbf4ab347f9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Install go diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 61d5e093a07..7d5f1e3966c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -38,14 +38,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -55,8 +56,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -140,7 +142,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Configure AWS Credentials @@ -150,10 +152,11 @@ jobs: aws-region: us-west-2 aws-secret-access-key: ${{ secrets.AWS_CORP_S3_UPLOAD_SECRET_ACCESS_KEY }} - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -163,8 +166,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -172,7 +176,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 @@ -197,14 +201,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -214,8 +219,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -223,7 +229,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: Clear GitHub Actions Ubuntu runner disk space @@ -292,7 +298,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Unshallow clone for tags @@ -304,8 +310,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -383,14 +390,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -400,8 +408,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml index 1aaf82cc7c5..ae9a7b99a60 100644 --- a/.github/workflows/nightly-test.yml +++ b/.github/workflows/nightly-test.yml @@ -38,14 +38,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -55,8 +56,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -137,14 +139,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -154,8 +157,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -163,7 +167,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: Clear GitHub Actions Ubuntu runner disk space @@ -231,14 +235,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -248,8 +253,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f03129bd142..c9fb7c4fb13 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -39,14 +39,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -56,8 +57,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -140,14 +142,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -157,8 +160,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -166,7 +170,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: Clear GitHub Actions Ubuntu runner disk space @@ -235,7 +239,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Unshallow clone for tags @@ -247,8 +251,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -308,14 +313,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -325,8 +331,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index e3872953679..6c0b49618ed 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Comment PR diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfe8be5f3e1..e19005ed6fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,14 +38,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -55,8 +56,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -136,8 +138,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - env: GITHUB_TOKEN: ${{ secrets.PULUMI_BOT_TOKEN }} @@ -153,14 +156,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -170,8 +174,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -179,7 +184,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: Clear GitHub Actions Ubuntu runner disk space @@ -248,7 +253,7 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Unshallow clone for tags @@ -260,8 +265,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -317,12 +323,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Install pulumictl - uses: jaxxstorm/action-install-gh-release@v1.5.0 + uses: jaxxstorm/action-install-gh-release@v1.10.0 with: + tag: v0.0.46 repo: pulumi/pulumictl - name: Add SDK version tag run: git tag "sdk/v$(pulumictl get version --language generic)" && git push origin @@ -356,14 +363,15 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -373,8 +381,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/release_command.yml b/.github/workflows/release_command.yml index 8b39c586b13..2a8fff366c5 100644 --- a/.github/workflows/release_command.yml +++ b/.github/workflows/release_command.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Should release PR uses: pulumi/action-release-by-pr-label@main with: diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index 907503f4922..d1feec4e5e8 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -39,11 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-mgmt repository: pulumi/ci-mgmt @@ -59,8 +59,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index 91334dcaaf2..cd95eabb192 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -46,15 +46,16 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -64,8 +65,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -162,14 +164,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -179,8 +182,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 @@ -188,7 +192,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: Clear GitHub Actions Ubuntu runner disk space @@ -298,15 +302,16 @@ jobs: runs-on: pulumi-ubuntu-8core steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Checkout Scripts Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-scripts repository: pulumi/scripts + ref: deca2c5c6015ad7aaea6f572a1c2b198ca323592 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -316,8 +321,9 @@ 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: + tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI uses: pulumi/actions@v4 diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 09d7ad85fee..7a5ed4a55a8 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 <