Bump logr to 1.4.0, fixup github workflow action

veqryn · Dec 21, 2023 · a396e33 · a396e33
1 parent 090b08b
commit a396e33
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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=