Skip to content

Commit 944ab93

Browse files
committed
chore(deps): rework go-test-coverage install
Signed-off-by: Szilard Parrag <[email protected]>
1 parent 1e9154c commit 944ab93

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112

113113
# This is a workaround as the action does not support setting working directory
114114
- name: Run coverage report
115-
run: go run github.com/vladopajic/go-test-coverage/[email protected] --profile=./build/_test_coverage/coverage_e2e.out --config=./.testcoverage.yml
115+
run: make test-e2e-coverage-report-ci
116116

117117
- name: Archive Test Results
118118
if: always()

Makefile

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ CONTROLLER_GEN_VERSION := 0.17.2
1010
# renovate: datasource=github-releases depName=golangci/golangci-lint versioning=semver
1111
GOLANGCI_LINT_VERSION := 1.64.6
1212

13+
# renovate: datasource=go depName=github.com/vladopajic/go-test-coverage/v2 versioning=semver
14+
GO_TEST_COVERAGE_VERSION := 2.12.1
15+
1316
# renovate: datasource=github-releases depName=norwoodj/helm-docs versioning=semver
1417
HELM_DOCS_VERSION = 1.14.2
1518

@@ -63,6 +66,8 @@ ENVTEST_BINARY_ASSETS := ${ENVTEST_BIN_DIR}/bin
6366
GOLANGCI_LINT := ${BIN}/golangci-lint
6467
LINTER_FLAGS := --timeout 10m
6568

69+
GO_TEST_COVERAGE := ${BIN}/go-test-coverage
70+
6671
HELM_DOCS := ${BIN}/helm-docs
6772

6873
KIND := ${BIN}/kind
@@ -192,19 +197,23 @@ test: codegen fmt vet manifests ${ENVTEST_BINARY_ASSETS} ${KUBEBUILDER} ## Run t
192197
ENVTEST_BINARY_ASSETS=${ENVTEST_BINARY_ASSETS} go test ./controllers/logging/... ./pkg/... -coverprofile ${TEST_COV_DIR}/cover_controllers_logging.out
193198
ENVTEST_BINARY_ASSETS=${ENVTEST_BINARY_ASSETS} go test ./controllers/extensions/... ./pkg/... -coverprofile ${TEST_COV_DIR}/cover_controllers_extensions.out
194199

195-
.PHONY: install-go-test-coverage
196-
install-go-test-coverage:
197-
GOBIN=${BIN} go install github.com/vladopajic/go-test-coverage/v2@latest
198-
199200
.PHONY: generate-test-coverage
200-
generate-test-coverage: install-go-test-coverage test
201+
generate-test-coverage: test
201202
rm -f ${TEST_COV_DIR}/coverage_all.out
202203
echo "mode: set" > ${TEST_COV_DIR}/coverage_all.out
203204
find -name 'cover_*.out' | xargs cat | grep -v "mode: set" >> ${TEST_COV_DIR}/coverage_all.out
204205

205206
.PHONY: check-coverage
206-
check-coverage: install-go-test-coverage generate-test-coverage
207-
GOBIN=${BIN} go-test-coverage --config=./.testcoverage.yml
207+
check-coverage: generate-test-coverage
208+
go-test-coverage --config=./.testcoverage.yml
209+
210+
.PHONY: test-e2e-coverage-report-ci
211+
test-e2e-coverage-report-ci: ${GO_TEST_COVERAGE}
212+
$(MAKE) test-e2e-coverage-report-no-deps
213+
214+
.PHONY: test-e2e-coverage-report-no-deps
215+
test-e2e-coverage-report-no-deps:
216+
${GO_TEST_COVERAGE} --profile=${TEST_COV_DIR}/coverage_e2e.out
208217

209218
.PHONY: test-e2e
210219
test-e2e: ${KIND} codegen manifests docker-build-e2e-test stern ## Run E2E tests
@@ -277,6 +286,13 @@ ${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: VERSION := v${GOLANGCI_L
277286
${GOLANGCI_LINT}_${GOLANGCI_LINT_VERSION}_${GOVERSION}: | ${BIN}
278287
${go_install_binary}
279288

289+
${GO_TEST_COVERAGE}: ${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION} | ${BIN}
290+
291+
${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: IMPORT_PATH := github.com/vladopajic/go-test-coverage/v2
292+
${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: VERSION := v${GO_TEST_COVERAGE_VERSION}
293+
${GO_TEST_COVERAGE}_${GO_TEST_COVERAGE_VERSION}_${GOVERSION}: | ${BIN}
294+
GOBIN=${BIN} go install ${IMPORT_PATH}@${VERSION}
295+
280296
${KIND}: ${KIND}_${KIND_VERSION}_${GOVERSION} | ${BIN}
281297
ln -sf $(notdir $<) $@
282298

0 commit comments

Comments
 (0)