From 92997c792dab3a5ea71b3939fb7dd10e2be95ac7 Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Wed, 22 May 2024 12:58:01 -0600 Subject: [PATCH 1/5] chore: fix codecov Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/test-unit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index f3425c1098..3f3d51211a 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -25,17 +25,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + + - name: Setup golang + uses: ./.github/actions/golang - name: Run coverage - run: go test -race -coverprofile=coverage.out -covermode=atomic + run: go test -race -coverprofile=coverage.out -covermode=atomic ./... - name: Upload coverage reports to Codecov uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 with: token: ${{ secrets.CODECOV_TOKEN }} - - name: Setup golang - uses: ./.github/actions/golang - - name: Run unit tests run: make test-unit \ No newline at end of file From ad6512b851b61558ea0c27ed3868f1c7ea4c805a Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Wed, 22 May 2024 13:33:56 -0600 Subject: [PATCH 2/5] try two Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/test-unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 3f3d51211a..aebee3da10 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/actions/golang - name: Run coverage - run: go test -race -coverprofile=coverage.out -covermode=atomic ./... + run: go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -race -coverprofile=coverage.out -covermode=atomic - name: Upload coverage reports to Codecov uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 From 229d6adba87ca8a251f3681620d8ca557380bc05 Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Wed, 22 May 2024 13:54:41 -0600 Subject: [PATCH 3/5] remove flag Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/test-unit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index aebee3da10..0eefa9323d 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/actions/golang - name: Run coverage - run: go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -race -coverprofile=coverage.out -covermode=atomic + run: go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -coverprofile=coverage.out -covermode=atomic - name: Upload coverage reports to Codecov uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 From 00400dcdeb4138cd46eb670bd2fdb67a71d68e5b Mon Sep 17 00:00:00 2001 From: schristoff <28318173+schristoff@users.noreply.github.com> Date: Wed, 22 May 2024 14:00:23 -0600 Subject: [PATCH 4/5] move go test into make Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com> --- .github/workflows/test-unit.yml | 11 ++++------- .gitignore | 1 + Makefile | 1 + 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 0eefa9323d..90429169f1 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -28,14 +28,11 @@ jobs: - name: Setup golang uses: ./.github/actions/golang - - - name: Run coverage - run: go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -coverprofile=coverage.out -covermode=atomic + - name: Run unit tests + run: make test-unit + - name: Upload coverage reports to Codecov uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1 with: - token: ${{ secrets.CODECOV_TOKEN }} - - - name: Run unit tests - run: make test-unit \ No newline at end of file + token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 493e7381c2..2a68c38107 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ zarf-sbom/ test-*.txt __debug_bin .netlify +coverage.out diff --git a/Makefile b/Makefile index 5683962afc..99c58369d8 100644 --- a/Makefile +++ b/Makefile @@ -208,6 +208,7 @@ test-upgrade: ## Run the Zarf CLI E2E tests for an external registry and cluster .PHONY: test-unit test-unit: ## Run unit tests + go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -coverprofile=coverage.out -covermode=atomic cd src/pkg && go test ./... -failfast -v -timeout 30m cd src/internal && go test ./... -failfast -v timeout 30m cd src/extensions/bigbang && go test ./. -failfast -v timeout 30m From 284751c2e13e98bddb643dede7ea7b16580076fb Mon Sep 17 00:00:00 2001 From: Lucas Rodriguez Date: Wed, 22 May 2024 15:43:49 -0500 Subject: [PATCH 5/5] add failfast and verbose flag to go test and remove cd --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 99c58369d8..1924780d4c 100644 --- a/Makefile +++ b/Makefile @@ -208,10 +208,7 @@ test-upgrade: ## Run the Zarf CLI E2E tests for an external registry and cluster .PHONY: test-unit test-unit: ## Run unit tests - go test $(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') -coverprofile=coverage.out -covermode=atomic - cd src/pkg && go test ./... -failfast -v -timeout 30m - cd src/internal && go test ./... -failfast -v timeout 30m - cd src/extensions/bigbang && go test ./. -failfast -v timeout 30m + go test -failfast -v -coverprofile=coverage.out -covermode=atomic $$(go list ./... | grep -v '^github.com/defenseunicorns/zarf/src/test' | grep -v 'github.com/defenseunicorns/zarf/src/extensions/bigbang/test') # INTERNAL: used to test that a dev has ran `make docs-and-schema` in their PR test-docs-and-schema: