From 8a2d81e46b1fdd8fbbd476d687f7a632c2dc9d16 Mon Sep 17 00:00:00 2001 From: Pulumi Bot Date: Fri, 6 Sep 2024 05:08:53 +0000 Subject: [PATCH] [internal] Update GitHub Actions workflow files --- .github/workflows/check-upstream-upgrade.yml | 3 ++- .github/workflows/master.yml | 9 ++------- .github/workflows/prerelease.yml | 9 ++------- .github/workflows/release.yml | 7 +------ .github/workflows/run-acceptance-tests.yml | 12 +++--------- .github/workflows/upgrade-bridge.yml | 6 ++++++ 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/.github/workflows/check-upstream-upgrade.yml b/.github/workflows/check-upstream-upgrade.yml index a4d997bc0..9e375a371 100644 --- a/.github/workflows/check-upstream-upgrade.yml +++ b/.github/workflows/check-upstream-upgrade.yml @@ -25,8 +25,9 @@ jobs: shell: bash - name: Run upgrade-provider upstream check id: upstream_version + # Using --repo-path=. skips git pull steps since the Checkout Repo steps has done those. run: | - upgrade-provider "$REPO" --kind=check-upstream-version + upgrade-provider "$REPO" --kind=check-upstream-version --repo-path=. env: REPO: ${{ github.repository }} shell: bash diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5374062ac..7c0be0d11 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -121,7 +121,7 @@ jobs: test: name: test - needs: + needs: - prerequisites - build_sdk permissions: @@ -152,13 +152,8 @@ jobs: pip3 install pipenv - name: Install dependencies run: make install_${{ matrix.language}}_sdk - - name: Install gotestfmt - uses: GoTestTools/gotestfmt-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: v2.5.0 - name: Run tests - run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 strategy: fail-fast: false matrix: diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 15303679c..e0c20e11d 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -66,7 +66,7 @@ jobs: test: name: test - needs: + needs: - prerequisites - build_sdk permissions: @@ -97,13 +97,8 @@ jobs: pip3 install pipenv - name: Install dependencies run: make install_${{ matrix.language}}_sdk - - name: Install gotestfmt - uses: GoTestTools/gotestfmt-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: v2.5.0 - name: Run tests - run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . strategy: fail-fast: false matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03cb33f33..956767c2e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -102,13 +102,8 @@ jobs: pip3 install pipenv - name: Install dependencies run: make install_${{ matrix.language}}_sdk - - name: Install gotestfmt - uses: GoTestTools/gotestfmt-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: v2.5.0 - name: Run tests - run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -parallel 4 . strategy: fail-fast: false matrix: diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml index fc5da00a4..7a745df1d 100644 --- a/.github/workflows/run-acceptance-tests.yml +++ b/.github/workflows/run-acceptance-tests.yml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: guibranco/github-status-action-v2@0849440ec82c5fa69b2377725b9b7852a3977e76 - with: + with: authToken: ${{secrets.GITHUB_TOKEN}} # Write an explicit status check called "Sentinel" which will only pass if this code really runs. # This should always be a required check for PRs. @@ -135,18 +135,12 @@ jobs: pip3 install pipenv - name: Install dependencies run: make install_${{ matrix.language}}_sdk - - name: Install gotestfmt - uses: GoTestTools/gotestfmt-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - version: v2.5.0 - name: Run tests if: matrix.testTarget == 'local' - run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 4 . - name: Run pulumi/examples tests if: matrix.testTarget == 'pulumiExamples' - run: cd examples && go test -v -json -count=1 -cover -timeout 2h -tags=${{ - matrix.language }} -run TestPulumiExamples -parallel 4 . 2>&1 | tee /tmp/gotest.log | gotestfmt + run: cd examples && go test -count=1 -cover -timeout 2h -tags=${{ matrix.language }} -run TestPulumiExamples -parallel 4 . strategy: fail-fast: false matrix: diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml index 69c476ffb..d302ae680 100644 --- a/.github/workflows/upgrade-bridge.yml +++ b/.github/workflows/upgrade-bridge.yml @@ -57,6 +57,12 @@ jobs: name: upgrade-provider runs-on: ubuntu-latest steps: + - name: Checkout Repo + uses: actions/checkout@v4 + - name: Setup tools + uses: ./.github/actions/setup-tools + with: + tools: pulumictl, pulumicli, go, node, dotnet, python, java - name: Call upgrade provider action if: github.event_name == 'workflow_dispatch' uses: pulumi/pulumi-upgrade-provider-action@v0.0.12