From bc7687fb9477f9648a6bb5299202d15dc969dc1b Mon Sep 17 00:00:00 2001 From: Venelin Date: Thu, 15 Feb 2024 12:13:05 +0000 Subject: [PATCH 1/2] update other actions --- .ci-mgmt.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml index f2a78e2fe08..39d86d4020e 100644 --- a/.ci-mgmt.yaml +++ b/.ci-mgmt.yaml @@ -35,7 +35,7 @@ runner: actions: preTest: - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} @@ -70,19 +70,19 @@ extraTests: timeout-minutes: 60 steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - 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: Make upstream run: make upstream - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version-file: 'provider/go.mod' cache-dependency-path: 'provider/go.sum' @@ -106,19 +106,19 @@ extraTests: 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -128,16 +128,16 @@ extraTests: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: v3.77.1 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -148,7 +148,7 @@ extraTests: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ From 65f67dc945a8f98bf97a8048c39f839b65aac96e Mon Sep 17 00:00:00 2001 From: Venelin Date: Thu, 15 Feb 2024 12:24:29 +0000 Subject: [PATCH 2/2] run ci-mgmt generate --- .github/workflows/check-upstream-upgrade.yml | 2 +- .github/workflows/license.yml | 4 +- .github/workflows/lint.yml | 2 +- .github/workflows/master.yml | 72 ++++++++++---------- .github/workflows/nightly-test.yml | 40 +++++------ .github/workflows/prerelease.yml | 66 +++++++++--------- .github/workflows/release.yml | 68 +++++++++--------- .github/workflows/resync-build.yml | 10 +-- .github/workflows/run-acceptance-tests.yml | 60 ++++++++-------- scripts/upstream.sh | 2 +- 10 files changed, 163 insertions(+), 163 deletions(-) diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index efc0ee9f237..a223dd1d473 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml index 430549db62d..f9bcd9df06f 100644 --- a/.github/workflows/license.yml +++ b/.github/workflows/license.yml @@ -44,13 +44,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dbf4ab347f9..5c85b106de1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -47,7 +47,7 @@ jobs: with: submodules: true - name: Install go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: # The versions of golangci-lint and setup-go here cross-depend and need to update together. go-version: 1.21 diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7d5f1e3966c..08dfcc4762b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -50,7 +50,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -61,24 +61,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -88,7 +88,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -112,7 +112,7 @@ jobs: - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -146,7 +146,7 @@ jobs: with: submodules: true - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_CORP_S3_UPLOAD_ACCESS_KEY_ID }} aws-region: us-west-2 @@ -160,7 +160,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -171,7 +171,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -213,7 +213,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -224,7 +224,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -274,7 +274,7 @@ jobs: github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-tfgen-${{ env.PROVIDER }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -304,7 +304,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -315,11 +315,11 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -402,7 +402,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -413,24 +413,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -440,7 +440,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -452,7 +452,7 @@ jobs: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ @@ -473,7 +473,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} @@ -510,19 +510,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - 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: Make upstream run: make upstream - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: cache-dependency-path: provider/go.sum go-version-file: provider/go.mod @@ -546,19 +546,19 @@ 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -568,16 +568,16 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: v3.77.1 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -586,7 +586,7 @@ jobs: tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ diff --git a/.github/workflows/nightly-test.yml b/.github/workflows/nightly-test.yml index ae9a7b99a60..849c1bab349 100644 --- a/.github/workflows/nightly-test.yml +++ b/.github/workflows/nightly-test.yml @@ -50,7 +50,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -61,24 +61,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -88,7 +88,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -112,7 +112,7 @@ jobs: - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -151,7 +151,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -162,7 +162,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -212,7 +212,7 @@ jobs: github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-tfgen-${{ env.PROVIDER }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -247,7 +247,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -258,24 +258,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -285,7 +285,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -297,7 +297,7 @@ jobs: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ @@ -318,7 +318,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index c9fb7c4fb13..71d9469cadd 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -51,7 +51,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -62,24 +62,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -89,7 +89,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -113,7 +113,7 @@ jobs: - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -154,7 +154,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -165,7 +165,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -215,7 +215,7 @@ jobs: github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-tfgen-${{ env.PROVIDER }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -245,7 +245,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -256,11 +256,11 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -325,7 +325,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -336,24 +336,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -363,7 +363,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -375,7 +375,7 @@ jobs: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ @@ -396,7 +396,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} @@ -433,19 +433,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - 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: Make upstream run: make upstream - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: cache-dependency-path: provider/go.sum go-version-file: provider/go.mod @@ -469,19 +469,19 @@ 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -491,16 +491,16 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: v3.77.1 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -509,7 +509,7 @@ jobs: tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e19005ed6fc..bfff221aa4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,7 +50,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -61,24 +61,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -88,7 +88,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -112,7 +112,7 @@ jobs: - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -168,7 +168,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -179,7 +179,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -229,7 +229,7 @@ jobs: github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-tfgen-${{ env.PROVIDER }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -259,7 +259,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -270,11 +270,11 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: us-east-2 @@ -342,7 +342,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Unshallow clone for PR merge bases run: git fetch --prune --unshallow --tags - name: Clean up release labels @@ -375,7 +375,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -386,24 +386,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -413,7 +413,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -425,7 +425,7 @@ jobs: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ @@ -446,7 +446,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} @@ -483,19 +483,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - 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: Make upstream run: make upstream - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: cache-dependency-path: provider/go.sum go-version-file: provider/go.mod @@ -519,19 +519,19 @@ 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -541,16 +541,16 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: v3.77.1 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -559,7 +559,7 @@ jobs: tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ diff --git a/.github/workflows/resync-build.yml b/.github/workflows/resync-build.yml index d1feec4e5e8..a87f3e540e5 100644 --- a/.github/workflows/resync-build.yml +++ b/.github/workflows/resync-build.yml @@ -53,7 +53,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -64,20 +64,20 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Sync with ci-mgmt diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index cd95eabb192..5fbd638a09e 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -59,7 +59,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -70,24 +70,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -97,7 +97,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -121,7 +121,7 @@ jobs: - name: Compress SDK folder run: tar -zcf sdk/${{ matrix.language }}.tar.gz -C sdk/${{ matrix.language }} . - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/${{ matrix.language }}.tar.gz @@ -176,7 +176,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -187,7 +187,7 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - if: github.event_name == 'pull_request' @@ -237,7 +237,7 @@ jobs: github.workspace }}/bin/ pulumi-resource-${{ env.PROVIDER }} pulumi-tfgen-${{ env.PROVIDER }} - name: Upload artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin/provider.tar.gz @@ -315,7 +315,7 @@ jobs: - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -326,24 +326,24 @@ jobs: tag: v0.0.46 repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: ^3 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Setup DotNet - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: ${{ env.DOTNETVERSION }} - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHONVERSION }} - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: cache: gradle distribution: temurin @@ -353,7 +353,7 @@ jobs: with: gradle-version: ${{ env.GRADLEVERSION }} - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -365,7 +365,7 @@ jobs: find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - run: dotnet nuget add source ${{ github.workspace }}/nuget - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ @@ -386,7 +386,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} version: v2.4.0 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v4 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-region: ${{ env.AWS_REGION }} @@ -427,19 +427,19 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ env.PR_COMMIT_SHA }} submodules: true - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - 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: Make upstream run: make upstream - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: cache-dependency-path: provider/go.sum go-version-file: provider/go.mod @@ -463,19 +463,19 @@ 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 - name: Unshallow clone for tags run: git fetch --prune --unshallow --tags - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: cache-dependency-path: | sdk/go.sum @@ -485,16 +485,16 @@ jobs: with: repo: pulumi/pulumictl - name: Install Pulumi CLI - uses: pulumi/actions@v4 + uses: pulumi/actions@v5 with: pulumi-version: v3.77.1 - name: Setup Node - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODEVERSION }} registry-url: https://registry.npmjs.org - name: Download provider + tfgen binaries - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ env.PROVIDER }}-provider.tar.gz path: ${{ github.workspace }}/bin @@ -503,7 +503,7 @@ jobs: tar -zxf ${{ github.workspace }}/bin/provider.tar.gz -C ${{ github.workspace}}/bin find ${{ github.workspace }} -name "pulumi-*-${{ env.PROVIDER }}" -print -exec chmod +x {} \; - name: Download SDK - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ matrix.language }}-sdk.tar.gz path: ${{ github.workspace}}/sdk/ diff --git a/scripts/upstream.sh b/scripts/upstream.sh index 7a5ed4a55a8..eddf7df10be 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -149,7 +149,7 @@ make "$1"' failed to apply ${patch}. This is because there is a conflict between the checked out version of upstream and the patch set. To resolve this conflict run: - FROM=\$LAST_KNOWN_GOOD_COMMIT make upstream.rebase + FROM=\$LAST_KNOWN_GOOD_COMMIT TO=\$NEW_COMMIT make upstream.rebase This will walk you through resolving the conflict and producing a patch set that cleanly applies to the current upstream.