From 0467dad9070f69b87834552c3c13cf87961886a6 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Mon, 1 Jul 2024 20:58:18 +0200 Subject: [PATCH 1/3] Experiment: try tparse instead of gotestfmt --- .github/actions/test-setup/action.yml | 6 ++++++ .github/workflows/build-test.yml | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/actions/test-setup/action.yml b/.github/actions/test-setup/action.yml index f8a1e655e0ed..ad01124d37d0 100644 --- a/.github/actions/test-setup/action.yml +++ b/.github/actions/test-setup/action.yml @@ -72,3 +72,9 @@ runs: with: tag: v2.5.0 repo: GoTestTools/gotestfmt + + - name: Install tparse + uses: jaxxstorm/action-install-gh-release@v1.11.0 + with: + tag: v0.14.0 + repo: mfridman/tparse diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 27d6bdb2374c..dae0b524556d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -197,13 +197,13 @@ jobs: OIDC_ARM_CLIENT_ID: ${{ inputs.oidc_arm_client_id }} run: | set -euo pipefail - cd examples && go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | gotestfmt + cd examples && go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all - name: Run short tests if: inputs.short_test run: | set -euo pipefail - cd examples && go test -v -json -cover -timeout 15m -short -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | gotestfmt + cd examples && go test -v -json -cover -timeout 15m -short -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all test_examples: needs: build_sdks @@ -255,7 +255,7 @@ jobs: cd examples && \ go mod edit -replace github.com/pulumi/examples/misc/test=../p-examples/misc/test/ && \ go mod tidy && \ - go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -run TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | gotestfmt + go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -run TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all test_provider: runs-on: ubuntu-latest @@ -279,6 +279,12 @@ jobs: tag: v2.5.0 repo: GoTestTools/gotestfmt + - name: Install tparse + uses: jaxxstorm/action-install-gh-release@v1.11.0 + with: + tag: v0.14.0 + repo: mfridman/tparse + - run: make ensure - name: Prerequisites artifact restore @@ -294,7 +300,7 @@ jobs: - name: Test Provider Library run: | set -euo pipefail - cd provider && go test -v -json -coverprofile="coverage.txt" -coverpkg=./... -timeout 1h -parallel 16 ./... 2>&1 | tee /tmp/gotest.log | gotestfmt + cd provider && go test -v -json -coverprofile="coverage.txt" -coverpkg=./... -timeout 1h -parallel 16 ./... 2>&1 | tee /tmp/gotest.log | tparse -all - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4 From 813dfc80157b394e3d9924bf0e40a1e0d8ae63fe Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Mon, 1 Jul 2024 21:30:27 +0200 Subject: [PATCH 2/3] it's a pure binary --- .github/actions/test-setup/action.yml | 4 +++- .github/workflows/build-test.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/actions/test-setup/action.yml b/.github/actions/test-setup/action.yml index ad01124d37d0..831edde78801 100644 --- a/.github/actions/test-setup/action.yml +++ b/.github/actions/test-setup/action.yml @@ -76,5 +76,7 @@ runs: - name: Install tparse uses: jaxxstorm/action-install-gh-release@v1.11.0 with: - tag: v0.14.0 repo: mfridman/tparse + extension-matching: disable + rename-to: tparse + chmod: 0755 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index dae0b524556d..6b775381c249 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -282,8 +282,10 @@ jobs: - name: Install tparse uses: jaxxstorm/action-install-gh-release@v1.11.0 with: - tag: v0.14.0 repo: mfridman/tparse + extension-matching: disable + rename-to: tparse + chmod: 0755 - run: make ensure From 92cdd0b9d61fe066e0242d6889dfc454c33d2a39 Mon Sep 17 00:00:00 2001 From: Thomas Kappler Date: Tue, 2 Jul 2024 17:32:00 +0200 Subject: [PATCH 3/3] -follow --- .github/workflows/build-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 6b775381c249..25098331d060 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -197,13 +197,13 @@ jobs: OIDC_ARM_CLIENT_ID: ${{ inputs.oidc_arm_client_id }} run: | set -euo pipefail - cd examples && go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all + cd examples && go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all -follow - name: Run short tests if: inputs.short_test run: | set -euo pipefail - cd examples && go test -v -json -cover -timeout 15m -short -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all + cd examples && go test -v -json -cover -timeout 15m -short -tags=${{ matrix.language }} -skip TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all -follow test_examples: needs: build_sdks @@ -255,7 +255,7 @@ jobs: cd examples && \ go mod edit -replace github.com/pulumi/examples/misc/test=../p-examples/misc/test/ && \ go mod tidy && \ - go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -run TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all + go test -v -json -cover -timeout 2h -tags=${{ matrix.language }} -run TestPulumiExamples -parallel 16 . 2>&1 | tee /tmp/gotest.log | tparse -all -follow test_provider: runs-on: ubuntu-latest @@ -302,7 +302,7 @@ jobs: - name: Test Provider Library run: | set -euo pipefail - cd provider && go test -v -json -coverprofile="coverage.txt" -coverpkg=./... -timeout 1h -parallel 16 ./... 2>&1 | tee /tmp/gotest.log | tparse -all + cd provider && go test -v -json -coverprofile="coverage.txt" -coverpkg=./... -timeout 1h -parallel 16 ./... 2>&1 | tee /tmp/gotest.log | tparse -all -follow - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4