Skip to content

Commit

Permalink
Merge pull request #11 from KiranSatyaRaj/upgrade_go_version_and_upda…
Browse files Browse the repository at this point in the history
…te_stackskip_test.go

chore: upgrade Go to latest version and update stackskip_test.go
  • Loading branch information
jenkins-x-bot authored Nov 22, 2022
2 parents 9f96f9c + 5840c8c commit 1e97e0a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ ORG := jenkins-x-plugins
ORG_REPO := $(ORG)/$(NAME)
RELEASE_ORG_REPO := $(ORG_REPO)
ROOT_PACKAGE := github.com/$(ORG_REPO)
# This version is just used to trigger a new build in case we update the version of go in jx3-pipeline-catalog, and dont have new PRs which use the updated version in the catalog.
# This does not reflect the go binary version which was used to build the jx binary, and also does not reflect the version in the catalog.
# The sole purpose of this variable is to build a new binary if we ever need to build a new jx binary with a new go version with no code change.
# If you notice that this version is not the same as the catalog version, please open a PR, the maintainers are happy to review it.
DUMMY_GO_VERSION := 1.18.6

GO_VERSION := $(shell $(GO) version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/')
GO_DEPENDENCIES := $(call rwildcard,pkg/,*.go) $(call rwildcard,cmd/,*.go)
Expand Down Expand Up @@ -185,4 +180,4 @@ docs: bin/docs ## update docs
@echo "Generating docs"
@./bin/docs --target=./docs/cmd
@./bin/docs --target=./docs/man/man1 --kind=man
@rm -f ./bin/docs
@rm -f ./bin/docs
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/jenkins-x/logrus-stackdriver-formatter

go 1.18
go 1.19

require (
github.com/go-stack/stack v1.8.1
Expand Down
3 changes: 2 additions & 1 deletion pkg/stackdriver/stackskip_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build unit
// +build unit

package stackdriver
Expand Down Expand Up @@ -52,7 +53,7 @@ func TestStackSkip(t *testing.T) {
"context": map[string]interface{}{
"reportLocation": map[string]interface{}{
"filePath": "testing/testing.go",
"lineNumber": 865.0,
"lineNumber": float64(1446),
"functionName": "tRunner",
},
},
Expand Down

0 comments on commit 1e97e0a

Please sign in to comment.