Skip to content

Commit

Permalink
Bump golang version from 1.20 to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
cheina97 authored and adamjensenbot committed Aug 23, 2023
1 parent f14e72c commit 894e896
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-generated-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: Run the automatic generation
working-directory: ./
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
cache: false

- name: golangci-lint
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'

- name: Execute go mod tidy and check the outcome
working-directory: ./
Expand Down
2 changes: 1 addition & 1 deletion build/common/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.21 as builder
WORKDIR /tmp/builder

COPY go.mod ./go.mod
Expand Down
2 changes: 1 addition & 1 deletion build/liqo-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as builder
FROM golang:1.21 as builder
ENV PATH /go/bin:/usr/local/go/bin:$PATH
ENV GOPATH /go
ENV K8S_VERSION=1.25.0
Expand Down
2 changes: 1 addition & 1 deletion build/liqoctl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ error() {
}
trap 'error "${BASH_SOURCE}" "${LINENO}"' ERR

GO_VERSION="1.20"
GO_VERSION="1.21"

docker run -v "$PWD:/liqo" -w /liqo -e="CGO_ENABLED=${CGO_ENABLED}" --rm "golang:${GO_VERSION}" \
go mod tidy && go build -o "./liqoctl-${GOOS}-${GOARCH}" \
Expand Down
4 changes: 2 additions & 2 deletions build/liqonet/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as goBuilder-wg
FROM golang:1.21 as goBuilder-wg

ARG VERSION=0.0.20230223

Expand All @@ -8,7 +8,7 @@ RUN git clone -b ${VERSION} https://git.zx2c4.com/wireguard-go
WORKDIR /go/wireguard-go
RUN CGO_ENABLED=0 make

FROM golang:1.20 as goBuilder
FROM golang:1.21 as goBuilder
WORKDIR /tmp/builder

COPY go.mod ./go.mod
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/liqotech/liqo

go 1.20
go 1.21

require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
Expand Down
46 changes: 46 additions & 0 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 894e896

Please sign in to comment.