diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index 192c338a..591770db 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 57b80879..1b3b92bc 100644 --- a/.github/workflows/command-dispatch.yml +++ b/.github/workflows/command-dispatch.yml @@ -34,7 +34,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 68eb7f6d..4c3414b9 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 e0f3f74f..1ff4a1c7 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -40,7 +40,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 489f5d75..4bf44cf4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -35,12 +35,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 @@ -50,8 +51,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,7 +137,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: @@ -143,10 +145,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 @@ -156,8 +159,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,7 +169,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 @@ -194,12 +198,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 @@ -209,8 +214,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 @@ -218,7 +224,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 @@ -276,7 +282,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 @@ -286,8 +292,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 @@ -365,12 +372,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 @@ -380,8 +388,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 a3a77da5..87bf83f8 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.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 @@ -292,12 +297,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 @@ -307,8 +313,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 5b3f185b..b583ecf3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -35,7 +35,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 ecb51c58..a449e87f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,12 +35,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 @@ -50,8 +51,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 @@ -131,8 +133,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 }} @@ -152,12 +155,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 @@ -167,8 +171,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 @@ -176,7 +181,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 @@ -234,7 +239,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 @@ -244,8 +249,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 @@ -301,10 +307,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 @@ -338,12 +345,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 @@ -353,8 +361,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 8b39c586..2a8fff36 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 01d844e8..f1d3679f 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -36,9 +36,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 @@ -54,8 +54,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 0422de01..7341591b 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -43,14 +43,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 @@ -60,8 +61,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,12 +166,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 @@ -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: Build tfgen & provider binaries @@ -288,14 +292,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 @@ -305,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 diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 09d7ad85..7a5ed4a5 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 <