Skip to content

Commit

Permalink
refactor: upgrade go version to 1.18.6
Browse files Browse the repository at this point in the history
Signed-off-by: ankitm123 <ankitmohapatra123@gmail.com>
  • Loading branch information
ankitm123 committed Sep 27, 2022
1 parent aec04c8 commit 567c9fd
Show file tree
Hide file tree
Showing 8 changed files with 59 additions and 457 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/jenkins-x-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v3
- name: build-make-test
uses: docker://golang:1.17.9
uses: docker://golang:1.18.6
with:
args: -c "make test linux"
entrypoint: /bin/sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/plugins-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: '1.17.11'
go-version: '1.18.6'
- run: make ${{ matrix.target }}
- run: |
./build/${{ matrix.target }}/${{ matrix.binary }} version
Expand Down
2 changes: 1 addition & 1 deletion .lighthouse/jenkins-x/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
- name: build-make-linux
resources: {}
# Move to catalog
- image: golang:1.17.9-alpine3.15
- image: golang:1.18.6-alpine3.16
name: coverage-report
resources: {}
script: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-boot
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.15
FROM alpine:3.16.2

ARG BUILD_DATE
ARG VERSION
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.17.9
FROM golang:1.18.6

ARG VERSION
ARG TARGETARCH
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ROOT_PACKAGE := github.com/$(ORG_REPO)
# 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.17.11
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
27 changes: 13 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/spf13/cobra v1.2.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/api v0.22.15
k8s.io/apimachinery v0.22.15
k8s.io/client-go v11.0.0+incompatible
sigs.k8s.io/kustomize/kyaml v0.10.15

Expand All @@ -34,7 +34,7 @@ require (
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand All @@ -54,7 +54,6 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.1.4 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
Expand All @@ -79,21 +78,21 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect
golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

Expand All @@ -104,9 +103,9 @@ replace (

github.com/json-iterator/go => github.com/json-iterator/go v1.1.12

k8s.io/api => k8s.io/api v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/api => k8s.io/api v0.22.15
k8s.io/apimachinery => k8s.io/apimachinery v0.22.15
k8s.io/client-go => k8s.io/client-go v0.22.15
)

go 1.17
go 1.18
Loading

0 comments on commit 567c9fd

Please sign in to comment.