From ca1b4c73cc4f321093aefca474f0a839d3410349 Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Fri, 9 Feb 2024 22:19:54 -0800 Subject: [PATCH] Update GitHub Actions workflows. (#298) This PR was automatically generated by the update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt repo, from commit 00ba6bcffc91771fa98a01b69c41df697f956e01. --- .github/workflows/command-dispatch.yml | 2 +- .github/workflows/community-moderation.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/master.yml | 41 +++++++++++++--------- .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 +-- 11 files changed, 95 insertions(+), 63 deletions(-) diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 93f9a87..c64a3db 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -38,7 +38,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: peter-evans/slash-command-dispatch@v2 with: commands: | diff --git a/.github/workflows/community-moderation.yml b/.github/workflows/community-moderation.yml index 68eb7f6..4c3414b 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 - id: schema_changed name: Check for diff in schema uses: dorny/paths-filter@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e7bccf3..2e7f679 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install go uses: actions/setup-go@v4 with: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a48a4d6..caadbd4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -39,12 +39,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -54,8 +55,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 @@ -139,7 +141,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: @@ -147,10 +149,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 @@ -160,8 +163,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 @@ -169,7 +173,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 @@ -198,12 +202,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -213,8 +218,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 @@ -222,7 +228,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 @@ -280,7 +286,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -290,8 +296,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 @@ -369,12 +376,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -384,8 +392,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 659bc7d..901bc2d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -40,12 +40,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -143,12 +145,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -158,8 +161,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 @@ -167,7 +171,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 @@ -225,7 +229,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go @@ -235,8 +239,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 @@ -296,12 +301,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -311,8 +317,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 54bebd1..43a6d01 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Comment PR uses: thollander/actions-comment-pull-request@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c91b05a..64997ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,12 +39,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -54,8 +55,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 @@ -135,8 +137,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 }} @@ -156,12 +159,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -171,8 +175,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 @@ -180,7 +185,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 @@ -238,7 +243,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -305,10 +311,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -342,12 +349,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -357,8 +365,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 8b39c58..2a8fff3 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 9d03d87..e95790b 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -40,9 +40,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: ci-mgmt repository: pulumi/ci-mgmt @@ -58,8 +58,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 fcdef70..1460cb4 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -47,14 +47,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - 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 @@ -168,12 +170,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - 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 @@ -183,8 +186,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 @@ -192,7 +196,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 @@ -292,14 +296,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - 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 @@ -309,8 +314,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 09d7ad8..7a5ed4a 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 <