Skip to content

Commit 068367b

Browse files
authored
Merge pull request #4 from kalverra/prepRelease
Cleaner Release
2 parents ada0527 + 4b14d0d commit 068367b

File tree

4 files changed

+13
-47
lines changed

4 files changed

+13
-47
lines changed

.github/workflows/e2e-test.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/lint-and-test.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,10 @@ jobs:
2222
go-version: stable
2323
- name: Install Dependencies
2424
run: go mod download
25-
- name: Set up gotestfmt
26-
uses: GoTestTools/gotestfmt-action@v2
27-
with:
28-
token: ${{ secrets.GITHUB_TOKEN }}
25+
- name: Install gotestsum
26+
run: go install gotest.tools/gotestsum@latest
2927
- name: Run tests
30-
run: |
31-
set -euo pipefail
32-
go test -json -cover -v ./... 2>&1 | tee /tmp/gotest.log | gotestfmt
28+
run: gotestsum -- -coverprofile=cover.out ./...
3329

3430
lint:
3531
name: Lint

.goreleaser.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ builds:
1111
goos:
1212
- linux
1313
- darwin
14+
- windows
15+
goarch:
16+
- amd64
17+
- arm64
1418
ldflags:
1519
- -s -w
1620
- -X github.com/kalverra/octometrics/cmd.version={{.Version}}
1721
- -X github.com/kalverra/octometrics/cmd.commit={{.Commit}}
1822
- -X github.com/kalverra/octometrics/cmd.buildTime={{.Date}}
1923
- -X github.com/kalverra/octometrics/cmd.builtBy=goreleaser
20-
- -X github.com/kalverra/octometrics/cmd.builtWith={{.GoVersion}}
24+
binary: octometrics
2125

2226
archives:
2327
- formats: [tar.gz]

Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
build:
2-
goreleaser build --clean --snapshot
2+
goreleaser release --clean --snapshot
33

44
test:
5-
go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
6-
set -euo pipefail
7-
go test -json -v ./... -silence-test-logs -cover 2>&1 | tee /tmp/gotest.log | gotestfmt
5+
go install gotest.tools/gotestsum@latest
6+
gotestsum -- -coverprofile=cover.out ./... -silence-test-logs
87

98
test-verbose:
10-
go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
11-
set -euo pipefail
12-
go test -json -v ./... -cover 2>&1 | tee /tmp/gotest.log | gotestfmt
9+
go install gotest.tools/gotestsum@latest
10+
gotestsum -- -coverprofile=cover.out ./...
1311

1412
lint:
1513
golangci-lint run --fix

0 commit comments

Comments
 (0)