diff --git a/.editorconfig b/.editorconfig index 294754154..6b7a5eea1 100644 --- a/.editorconfig +++ b/.editorconfig @@ -7,7 +7,7 @@ indent_style = space insert_final_newline = true trim_trailing_whitespace = true -[{Makefile,go.mod,go.sum,*.go,.gitmodules,*.sh}] +[{Makefile,go.mod,go.sum,*.go,.gitmodules,*.sh,*.mk}] indent_size = 8 indent_style = tab diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a8c5d66ab..b1cdb321c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.17.0" + go-version: "1.17" - name: make verify run: make verify test: @@ -25,11 +25,13 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.14.6" + go-version: "1.17" - name: Generate run: make generate + - name: go clean -testcache + run: go clean -testcache - name: go test - run: go test -coverprofile=coverage.txt ./... + run: go test -coverprofile=coverage.txt ./... -v - name: upload codecov run: bash <(curl -s https://codecov.io/bash) ci-checks: @@ -60,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: "1.14.6" + go-version: "1.17" - run: make crosscompile -j$(nproc) - name: Upload tink-cli binaries uses: actions/upload-artifact@v2 diff --git a/.gitignore b/.gitignore index e7b4c2d55..85c4eae69 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ cmd/tink-worker/tink-worker doc/ .idea .vscode +coverage.txt # Terraform .terraform @@ -20,4 +21,4 @@ deploy/state out/ .*.swp -hack/tools \ No newline at end of file +hack/tools diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..1f790f124 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,2 @@ +ignore: + - "**/zz_generated.deepcopy.go" diff --git a/tools.go b/tools.go index 66e94bc3c..be7209cfd 100644 --- a/tools.go +++ b/tools.go @@ -1,4 +1,4 @@ -// +build tools +//go:build tools package tools