Skip to content

Commit

Permalink
Updated repository config files (#565)
Browse files Browse the repository at this point in the history
Signed-off-by: Micah Hausler <[email protected]>

## Description

Extracted repo config changes from #563

## Why is this needed

* Go version is out of date in `ci.yaml`
* `.mk` files were missing from editor config
* Coverage was counted against for generated files

Fixes: #

N/A

## How Has This Been Tested?

Ran verify/tests locally

## How are existing users impacted? What migration steps/scripts do we need?

N/A

## Checklist:

I have:

- [x] updated the documentation and/or roadmap (if required)
- [x] added unit or e2e tests
- [x] provided instructions on how to upgrade
  • Loading branch information
mergify[bot] authored Dec 3, 2021
2 parents 64200ed + 51226f3 commit 5de0768
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ cmd/tink-worker/tink-worker
doc/
.idea
.vscode
coverage.txt

# Terraform
.terraform
Expand All @@ -20,4 +21,4 @@ deploy/state
out/

.*.swp
hack/tools
hack/tools
2 changes: 2 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ignore:
- "**/zz_generated.deepcopy.go"
2 changes: 1 addition & 1 deletion tools.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build tools
//go:build tools

package tools

Expand Down

0 comments on commit 5de0768

Please sign in to comment.