golang update to v1.22.6

Signed-off-by: Navid Yaghoobi <[email protected]>
containers · Sep 27, 2024 · ca69dc4 · ca69dc4
1 parent e083763
commit ca69dc4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 56 deletions.
diff --git a/.github/workflows/build-and-publish.yaml b/.github/workflows/build-and-publish.yaml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-go@v3
 
         with:
-          go-version: '>=1.21'
+          go-version: '>=1.22'
 
       - name: Build binary
         run: |

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '>=1.21'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           go mod tidy
@@ -24,34 +24,14 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          # cannot use 1.21.X latest version since golangci-lint has an issue.
-          go-version: '1.21.4'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           bash hack/install_dep.sh
           make .install.golangci-lint
           make lint
           make gofmt
 
-#  tests_podmanv4:
-#    runs-on: ubuntu-latest
-#    container:
-#      image: quay.io/containers/podman:v4
-#      volumes:
-#        - container_volume:/var/lib/containers
-#      options: "--device /dev/fuse:rw --security-opt label=disable --security-opt seccomp=unconfined --privileged"
-#    steps:
-#      - uses: actions/setup-go@v3
-#        with:
-#          go-version: '1.21.4'
-#      - uses: actions/checkout@v3
-#      - run: |
-#          yum -y install make gcc glib2-devel glibc-devel glibc-static device-mapper-devel
-#          export GOBIN=$(pwd)/bin/
-#          export CGO_ENABLED=1
-#          make .install.ginkgo
-#          make test
-
   tests_podmanv5:
     runs-on: ubuntu-latest
     container:
@@ -62,7 +42,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21.4'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           yum -y install make gcc glib2-devel glibc-devel glibc-static device-mapper-devel
@@ -78,7 +58,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '>=1.21'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           bash hack/install_dep.sh

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -45,7 +45,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '>=1.21'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           go mod tidy
@@ -60,34 +60,14 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          # cannot use 1.21.X latest version since golangci-lint has an issue.
-          go-version: '1.21.4'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           bash hack/install_dep.sh
           make .install.golangci-lint
           make lint
           make gofmt
 
-#  tests_podmanv4:
-#    runs-on: ubuntu-latest
-#    container:
-#      image: quay.io/containers/podman:v4
-#      volumes:
-#        - container_volume:/var/lib/containers
-#      options: "--device /dev/fuse:rw --security-opt label=disable --security-opt seccomp=unconfined --privileged"
-#    steps:
-#      - uses: actions/setup-go@v3
-#        with:
-#          go-version: '1.21.4'
-#      - uses: actions/checkout@v3
-#      - run: |
-#          yum -y install make gcc glib2-devel glibc-devel glibc-static device-mapper-devel
-#          export GOBIN=$(pwd)/bin/
-#          export CGO_ENABLED=1
-#          make .install.ginkgo
-#          make test
-
   tests_podmanv5:
     runs-on: ubuntu-latest
     container:
@@ -98,7 +78,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '1.21.4'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           yum -y install make gcc glib2-devel glibc-devel glibc-static device-mapper-devel
@@ -114,7 +94,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: '>=1.21'
+          go-version: '>=1.22'
       - uses: actions/checkout@v3
       - run: |
           bash hack/install_dep.sh

diff --git a/.packit.yaml b/.packit.yaml
@@ -14,12 +14,13 @@ jobs:
     targets:
       - fedora-latest-stable
       - fedora-development
-      - epel-9-x86_64
-      - epel-9-aarch64
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
+      # Disabled until there is go 1.22.6 in centos stream and epel
+      #- epel-9-x86_64
+      #- epel-9-aarch64
+      #- centos-stream-9-x86_64
+      #- centos-stream-9-aarch64
+      #- centos-stream-10-x86_64
+      #- centos-stream-10-aarch64
     actions:
       post-upstream-clone:
         - "rpkg spec --outdir ./"

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/containers/prometheus-podman-exporter
 
-go 1.21.0
+go 1.22.6
 
 require (
 	github.com/containers/common v0.60.3