Skip to content

Commit

Permalink
Merge pull request #165 from mjura/go-master
Browse files Browse the repository at this point in the history
Bump go version to 1.20
  • Loading branch information
mjura authored Aug 21, 2023
2 parents 3fdd433 + eb52146 commit 675203d
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/apidiff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
# Do not bump go version joelanford/go-apidiff is build with go 1.18
- uses: actions/setup-go@v4
with:
go-version: 1.19
- uses: joelanford/go-apidiff@main
- uses: joelanford/go-apidiff@main
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x
- uses: actions/[email protected]
with:
path: |
Expand All @@ -23,4 +23,4 @@ jobs:
restore-keys: |
${{ runner.os }}-build-go-${{ hashFiles('**/go.sum') }}
- name: Build GKE operator binary
run: make operator
run: make operator
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x
- name: Analysis
uses: golangci/golangci-lint-action@v3
with:
args: -v
args: -v
2 changes: 1 addition & 1 deletion .github/workflows/update-rancher-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
env:
GOARCH: amd64
CGO_ENABLED: 0
SETUP_GO_VERSION: '1.19.*'
SETUP_GO_VERSION: '1.20.*'

jobs:
create-rancher-pr:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x
- uses: actions/[email protected]
with:
path: |
Expand All @@ -23,4 +23,4 @@ jobs:
${{ runner.os }}-test-go-${{ hashFiles('**/go.sum') }}
- name: Run make verify
run: |
make verify
make verify
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
run:
timeout: 5m
go: "1.19"
go: "1.20"
skip-files:
- "zz_generated_*"
skip-dirs:
Expand Down Expand Up @@ -87,4 +87,4 @@ issues:
- linters:
- revive
text: "var-naming: don't use an underscore in package name"
path: 'mock(\w+)/doc.go$'
path: 'mock(\w+)/doc.go$'
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN zypper -n update && \

ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
RUN curl -sLf https://storage.googleapis.com/golang/go1.19.3.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
RUN curl -sLf https://go.dev/dl/go1.20.7.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
# workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043
RUN if [ "${ARCH}" == "arm64" ]; then \
zypper -n install binutils-gold ; \
Expand Down
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/rancher/gke-operator

go 1.19
go 1.20

replace k8s.io/client-go => k8s.io/client-go v0.25.4

Expand Down

0 comments on commit 675203d

Please sign in to comment.