From eb745d2c1c5c79a82e618c219f5986192efe6ec7 Mon Sep 17 00:00:00 2001
From: "Mohamed S. Mahmoud" <mmahmoud@redhat.com>
Date: Wed, 18 Oct 2023 07:01:05 -0400
Subject: [PATCH] update github actions to use go1.21 (#213)
* update github actions to use go1.21
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
* update golangci-lint
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
---------
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
---
.github/workflows/pull_request.yml | 2 +-
.github/workflows/pull_request_e2e.yml | 2 +-
.github/workflows/push_image.yml | 2 +-
.github/workflows/push_image_pr.yml | 2 +-
.github/workflows/release.yml | 2 +-
Makefile | 2 +-
go.mod | 3 ++-
go.sum | 3 ++-
scripts/generators.Dockerfile | 2 +-
vendor/modules.txt | 2 ++
10 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 64df4b3bf..7979cec60 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- go: ['1.19','1.20']
+ go: ['1.20','1.21']
steps:
- uses: actions/checkout@v3
- name: Set up Go
diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml
index 16fc97b89..8dc5c3157 100644
--- a/.github/workflows/pull_request_e2e.yml
+++ b/.github/workflows/pull_request_e2e.yml
@@ -17,7 +17,7 @@ jobs:
- name: set up go 1.x
uses: actions/setup-go@v3
with:
- go-version: '1.20'
+ go-version: '1.21'
- name: checkout
uses: actions/checkout@v3
- name: run end-to-end tests
diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml
index 175094768..67860d2dc 100644
--- a/.github/workflows/push_image.yml
+++ b/.github/workflows/push_image.yml
@@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- go: ['1.20']
+ go: ['1.21']
steps:
- name: install make
run: sudo apt-get install make
diff --git a/.github/workflows/push_image_pr.yml b/.github/workflows/push_image_pr.yml
index 40380bf01..7ea166883 100644
--- a/.github/workflows/push_image_pr.yml
+++ b/.github/workflows/push_image_pr.yml
@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- go: ['1.20']
+ go: ['1.21']
steps:
- name: install make
run: sudo apt-get install make
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d0fd17c51..129b55dbb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- go: ['1.20']
+ go: ['1.21']
steps:
- name: checkout
uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index b11fa111f..8eca7a127 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ OCI_BIN ?= $(shell basename ${OCI_BIN_PATH})
LOCAL_GENERATOR_IMAGE ?= ebpf-generator:latest
CILIUM_EBPF_VERSION := v0.11.0
-GOLANGCI_LINT_VERSION = v1.53.3
+GOLANGCI_LINT_VERSION = v1.54.2
CLANG ?= clang
CFLAGS := -O2 -g -Wall -Werror $(CFLAGS)
GOOS ?= linux
diff --git a/go.mod b/go.mod
index c94035097..57df199ce 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/netobserv/netobserv-ebpf-agent
-go 1.19
+go 1.20
require (
github.com/caarlos0/env/v6 v6.10.1
@@ -79,6 +79,7 @@ require (
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
+ golang.org/x/tools v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
diff --git a/go.sum b/go.sum
index b7ce0bcca..702f618a5 100644
--- a/go.sum
+++ b/go.sum
@@ -551,7 +551,8 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
+golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
+golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/scripts/generators.Dockerfile b/scripts/generators.Dockerfile
index df6d3ce7f..e8f5c0e75 100644
--- a/scripts/generators.Dockerfile
+++ b/scripts/generators.Dockerfile
@@ -1,6 +1,6 @@
FROM fedora:35
-ARG GOVERSION="1.20.5"
+ARG GOVERSION="1.21.3"
ARG PROTOCVERSION="3.19.4"
# Installs dependencies that are required to compile eBPF programs
diff --git a/vendor/modules.txt b/vendor/modules.txt
index efa5e56e2..effa89d0c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -354,6 +354,8 @@ golang.org/x/text/unicode/norm
# golang.org/x/time v0.3.0
## explicit
golang.org/x/time/rate
+# golang.org/x/tools v0.11.0
+## explicit; go 1.18
# google.golang.org/appengine v1.6.7
## explicit; go 1.11
google.golang.org/appengine/internal
--
GitLab