From a396e33f677ca15c253358861c83c26d78db0b00 Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Thu, 21 Dec 2023 01:38:00 -0700 Subject: [PATCH] Bump logr to 1.4.0, fixup github workflow action --- .github/workflows/build_and_test.yml | 15 ++++++++++----- examples/go.mod | 2 +- examples/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f9d70e3..deef14d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -64,22 +64,27 @@ jobs: with: go-version: ${{ matrix.go-version }} - - name: Display Go version + - name: Display Go version ${{ matrix.go-version }} run: go version - - name: Create workspace + - name: Create workspace ${{ matrix.go-version }} run: | go work init . go work use ./examples go work use ./otel - - name: Build + - name: Install dependencies ${{ matrix.go-version }} + run: | + go get -t -u golang.org/x/tools/cmd/cover + go mod download + + - name: Build ${{ matrix.go-version }} run: go build -v ./... ./otel/... ./examples/... - - name: Test + - name: Test ${{ matrix.go-version }} run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./... ./otel/... ./examples/... - - name: Upload coverage reports to Codecov + - name: Upload coverage reports to Codecov ${{ matrix.go-version }} uses: codecov/codecov-action@v3 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/examples/go.mod b/examples/go.mod index bfa4cc4..dcda17e 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -12,7 +12,7 @@ require ( ) require ( - github.com/go-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect go.opentelemetry.io/otel/metric v1.21.0 // indirect golang.org/x/sys v0.14.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 3764caa..b1ebf63 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -1,8 +1,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.0 h1:wx+BduGRXjIL6VPeeb7DRX+ii7sR/ch8DlRifHR589o= +github.com/go-logr/logr v1.4.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= diff --git a/go.mod b/go.mod index 57fbf30..e7e6a52 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/veqryn/slog-context go 1.21 -require github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d +require github.com/go-logr/logr v1.4.0 diff --git a/go.sum b/go.sum index cd38fdc..ddf2420 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d h1:T7GLmPib4CwVBWBqKhEh+HB9vpnFbGKMgcXBclVkE7Y= -github.com/go-logr/logr v1.3.1-0.20231201162808-6151b2fb393d/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.0 h1:wx+BduGRXjIL6VPeeb7DRX+ii7sR/ch8DlRifHR589o= +github.com/go-logr/logr v1.4.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=