diff --git a/.env.tools b/.env.tools new file mode 100644 index 0000000..b1a214e --- /dev/null +++ b/.env.tools @@ -0,0 +1 @@ +export TOOLS_BUILDNUMBER=20250403.6 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..187a094 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +**/go.sum -diff -merge +**/go.sum linguist-generated=true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cef2b6f..ec18889 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v4 with: - go-version: '1.23.x' + go-version: '1.24.x' token: ${{ secrets.GITHUB_TOKEN }} cache-dependency-path: | datatrails-common-api/go.sum @@ -26,9 +26,7 @@ jobs: - name: Install Go quality tools run: | go install golang.org/x/tools/cmd/goimports@v0.1.7 - go install github.com/axw/gocov/gocov@v1.1.0 - go install github.com/jstemmer/go-junit-report/v2@v2.1.0 - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.2 - name: Code Quality run: | diff --git a/eventsv1/go.mod b/eventsv1/go.mod index 2ed8060..1ade7bc 100644 --- a/eventsv1/go.mod +++ b/eventsv1/go.mod @@ -1,6 +1,6 @@ module github.com/datatrails/go-datatrails-serialization/eventsv1 -go 1.23.0 +go 1.24 require ( github.com/stretchr/testify v1.10.0 diff --git a/eventsv1/test_results/main.out b/eventsv1/test_results/main.out index 766f55e..869e268 100644 --- a/eventsv1/test_results/main.out +++ b/eventsv1/test_results/main.out @@ -1,2 +1,9 @@ mode: atomic -github.com/datatrails/go-datatrails-serialization/eventsv1/test.go:3.17,5.2 1 1 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:27.63,33.16 3 0 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:33.16,35.3 1 0 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:37.2,37.38 1 0 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:42.58,46.16 2 11 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:46.16,48.3 1 0 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:53.2,54.16 2 11 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:54.16,56.3 1 0 +github.com/datatrails/go-datatrails-serialization/eventsv1/serializer.go:58.2,58.36 1 11 diff --git a/taskfiles/Taskfile_gotest.yml b/taskfiles/Taskfile_gotest.yml index e144585..32d6915 100644 --- a/taskfiles/Taskfile_gotest.yml +++ b/taskfiles/Taskfile_gotest.yml @@ -37,6 +37,6 @@ tasks: -v \ -coverprofile={{.UNITTEST_DIR}}/main.out \ ./... \ - 2>&1 + 2>&1 - gocov convert {{.UNITTEST_DIR}}/main.out > {{.UNITTEST_DIR}}/coverage.json \ No newline at end of file + go tool cover -html={{.UNITTEST_DIR}}/main.out -o {{.UNITTEST_DIR}}/coverage.html