diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 192c338..591770d 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags shell: bash diff --git a/.github/workflows/command-dispatch.yml b/.github/workflows/command-dispatch.yml index 6f3b37b..49ef68e 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -35,7 +35,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 227063b..4cc9a67 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 05cd165..de226ab 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -41,7 +41,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/main.yml b/.github/workflows/main.yml index f55f140..a3bb743 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,12 +36,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 @@ -51,8 +52,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,7 +138,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: @@ -144,10 +146,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 @@ -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: Echo Coverage Output Dir @@ -195,12 +199,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 @@ -210,8 +215,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 @@ -219,7 +225,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 @@ -277,7 +283,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 @@ -287,8 +293,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 @@ -366,12 +373,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 @@ -381,8 +389,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 9237cb3..4903467 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -37,12 +37,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 @@ -52,8 +53,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,12 +142,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 @@ -155,8 +158,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 @@ -164,7 +168,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 @@ -222,7 +226,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 @@ -232,8 +236,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 @@ -293,12 +298,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 @@ -308,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/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 5182362..13923d1 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,7 +36,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 a14b977..a3cbc11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,12 +36,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 @@ -51,8 +52,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,12 +141,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 @@ -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: Build tfgen & provider binaries @@ -221,7 +225,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 @@ -231,8 +235,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 @@ -288,10 +293,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 @@ -325,12 +331,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 @@ -340,8 +347,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 90e5994..6a3caa6 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -37,9 +37,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 @@ -55,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 diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index d32e22e..32edfec 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -44,14 +44,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 @@ -61,8 +62,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 @@ -165,12 +167,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 @@ -180,8 +183,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 @@ -189,7 +193,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 @@ -289,14 +293,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 @@ -306,8 +311,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 <