Skip to content

Commit

Permalink
use Go 1.20.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mikko Ylinen <[email protected]>
  • Loading branch information
mythi authored and fidencio committed Sep 1, 2023
1 parent 9f4dbeb commit 9953aea
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/gofmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ jobs:
name: gofmt
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.18
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version-file: go.mod
check-latest: true
- name: gofmt
run : |
gofmt -s -w .
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ jobs:
name: lint
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.18
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version-file: go.mod
check-latest: true
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ jobs:
- uses: actions/checkout@v3

- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v4
with:
go-version: 1.18
go-version-file: go.mod
check-latest: true

- name: Download controller-gen
run: make controller-gen
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG IMG_NAME
ARG IMG_VERSION

# Build the manager binary
FROM ${IMG_NAME:-golang}:${IMG_VERSION:-1.18} as builder
FROM ${IMG_NAME:-golang}:${IMG_VERSION:-1.20} as builder

WORKDIR /workspace
# Copy the Go Modules manifests
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/confidential-containers/operator

go 1.18
go 1.20

require (
github.com/go-logr/logr v1.2.3
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/ansible/group_vars/all
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build_pkgs:
- make
- gcc
container_runtime: containerd
go_version: 1.18.5
go_version: 1.20.7
operator_sdk_version: v1.23.0
# conntrack and socat are needed by the `kubeadm init` preflight checks
kubeadm_pkgs:
Expand Down

0 comments on commit 9953aea

Please sign in to comment.