From 5664a4d7dce1ec677efaffc3792f48f3e5fbf759 Mon Sep 17 00:00:00 2001
From: Ivan Babrou <github@ivan.computer>
Date: Tue, 6 Feb 2024 23:20:59 -0800
Subject: [PATCH] Upgrade go to v1.22

---
 .github/workflows/ci.yml | 14 +++++++-------
 Dockerfile               |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb8faeb2..fd2e5f40 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,7 +160,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Download libbpf.tar.gz
         uses: actions/download-artifact@v4
@@ -190,7 +190,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Install libelf-dev
         run: sudo apt-get install -y libelf-dev
@@ -213,7 +213,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Download libbpf.tar.gz
         uses: actions/download-artifact@v4
@@ -243,7 +243,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Install libelf-dev
         run: sudo apt-get install -y libelf-dev
@@ -266,7 +266,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Download libbpf.tar.gz
         uses: actions/download-artifact@v4
@@ -298,7 +298,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
 
       - name: Install libelf-dev
         run: sudo apt-get install -y libelf-dev
@@ -322,7 +322,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
           cache: false # https://github.com/golangci/golangci-lint-action/issues/807
 
       - name: Install libelf-dev
diff --git a/Dockerfile b/Dockerfile
index 85236304..7eb2ec5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN make -j $(nproc) -C /build/ebpf_exporter libbpf.a && \
     tar -C /build/ebpf_exporter/libbpf/dest -czf /build/libbpf.tar.gz .
 
 # ebpf_exporter binary
-FROM golang:1.21-bookworm as ebpf_exporter_builder
+FROM golang:1.22-bookworm as ebpf_exporter_builder
 
 RUN apt-get update && \
     apt-get install -y libelf-dev pci.ids