diff --git a/.github/workflows/golang.yaml b/.github/workflows/golang.yaml index e1a4dc8..8a4633c 100644 --- a/.github/workflows/golang.yaml +++ b/.github/workflows/golang.yaml @@ -28,7 +28,7 @@ jobs: - uses: actions/setup-go@v6 with: go-version: ${{ env.GO_VERSION }} - - name: lint-license-and-shell + - name: lint-license run: | make lint-no-golangci - name: golangci-lint @@ -44,6 +44,10 @@ jobs: go-version: ${{ env.GO_VERSION }} - name: test run: make test + - name: Convert coverage to lcov + uses: jandelgado/gcov2lcov-action@v1.2.0 + with: + infile: testkit.coverprofile - name: Coveralls GitHub Action uses: coverallsapp/github-action@v2.3.7 with: diff --git a/Makefile b/Makefile index 572d228..56584ff 100644 --- a/Makefile +++ b/Makefile @@ -78,8 +78,7 @@ lint: lint-no-golangci golangci-lint ## Run linters such as golangci-lint and ad .PHONY: lint-no-golangci lint-no-golangci: addlicense - find . -not -path '*/.*' -name '*.go' -exec $(ADDLICENSE) -check -l apache -s=only -check {} + - shellcheck hack/*.sh + find . -not -path '*/.*' -name '*.go' -exec $(ADDLICENSE) -check -l apache -s=only {} ';' .PHONY: scan scan: diff --git a/container/container.go b/container/container.go index 3a57a9a..6574195 100644 --- a/container/container.go +++ b/container/container.go @@ -1,4 +1,4 @@ -// Copyright 2026 BWI GmbH and Solution Arsenal contributors +// Copyright 2026 BWI GmbH and Testkit contributors // SPDX-License-Identifier: Apache-2.0 package container diff --git a/container/container_test.go b/container/container_test.go index d7a1a45..6404e01 100644 --- a/container/container_test.go +++ b/container/container_test.go @@ -1,4 +1,4 @@ -// Copyright 2026 BWI GmbH and Solution Arsenal contributors +// Copyright 2026 BWI GmbH and Testkit contributors // SPDX-License-Identifier: Apache-2.0 package container diff --git a/container/zot/zot.go b/container/zot/zot.go index e858429..9afa709 100644 --- a/container/zot/zot.go +++ b/container/zot/zot.go @@ -1,4 +1,4 @@ -// Copyright 2026 BWI GmbH and Solution Arsenal contributors +// Copyright 2026 BWI GmbH and Testkit contributors // SPDX-License-Identifier: Apache-2.0 package zot diff --git a/container/zot/zot_test.go b/container/zot/zot_test.go index bdb8da6..9e9063b 100644 --- a/container/zot/zot_test.go +++ b/container/zot/zot_test.go @@ -1,4 +1,4 @@ -// Copyright 2026 BWI GmbH and Solution Arsenal contributors +// Copyright 2026 BWI GmbH and Testkit contributors // SPDX-License-Identifier: Apache-2.0 package zot