From fd360b5523486bc6b26141310d385b1d857cf557 Mon Sep 17 00:00:00 2001
From: Reece Williams <reecepbcups@gmail.com>
Date: Tue, 20 Aug 2024 17:47:17 -0500
Subject: [PATCH] bump: go1.22 + golangci v1.56.2

---
 .github/workflows/async-icq.yml                 | 6 +++---
 .github/workflows/packet-forward-middleware.yml | 6 +++---
 middleware/packet-forward-middleware/Dockerfile | 2 +-
 middleware/packet-forward-middleware/e2e/go.mod | 2 +-
 middleware/packet-forward-middleware/go.mod     | 2 +-
 modules/async-icq/Dockerfile.icq                | 4 ++--
 modules/async-icq/Dockerfile.icq-demo           | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/async-icq.yml b/.github/workflows/async-icq.yml
index 4645496f..975b165f 100644
--- a/.github/workflows/async-icq.yml
+++ b/.github/workflows/async-icq.yml
@@ -6,8 +6,8 @@ on:
       - '.github/workflows/async-icq.yml'
 
 env:
-  LINT_VERSION: v1.52
-  GO_VERSION: 1.21.0
+  LINT_VERSION: v1.56.2
+  GO_VERSION: 1.22.0
   WORKING_DIRECTORY: modules/async-icq
 
   HOST_TAR_PATH: /tmp/icq-host.tar
@@ -131,4 +131,4 @@ jobs:
           docker image ls -a
 
       - name: Run Test
-        run: make ${{ matrix.test }}
\ No newline at end of file
+        run: make ${{ matrix.test }}
diff --git a/.github/workflows/packet-forward-middleware.yml b/.github/workflows/packet-forward-middleware.yml
index 9c5cec65..c755e7c1 100644
--- a/.github/workflows/packet-forward-middleware.yml
+++ b/.github/workflows/packet-forward-middleware.yml
@@ -6,8 +6,8 @@ on:
       - '.github/workflows/packet-forward-middleware.yml'
 
 env:
-    LINT_VERSION: v1.55.2
-    GO_VERSION: 1.21.0
+    LINT_VERSION: v1.56.2
+    GO_VERSION: 1.22.0
     WORKING_DIRECTORY: middleware/packet-forward-middleware
 
     DOCKER_TAG: pfm:local
@@ -105,4 +105,4 @@ jobs:
           docker image ls -a
 
       - name: Run Test
-        run: make ${{ matrix.test }}
\ No newline at end of file
+        run: make ${{ matrix.test }}
diff --git a/middleware/packet-forward-middleware/Dockerfile b/middleware/packet-forward-middleware/Dockerfile
index c2af5e10..93ef54ef 100644
--- a/middleware/packet-forward-middleware/Dockerfile
+++ b/middleware/packet-forward-middleware/Dockerfile
@@ -1,7 +1,7 @@
 # docker build . -t pfm:local
 # docker run --rm -it pfm:local q ibc-router
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;
 
diff --git a/middleware/packet-forward-middleware/e2e/go.mod b/middleware/packet-forward-middleware/e2e/go.mod
index 4890d466..c45ad5a4 100644
--- a/middleware/packet-forward-middleware/e2e/go.mod
+++ b/middleware/packet-forward-middleware/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/e2e
 
-go 1.21
+go 1.22
 
 toolchain go1.22.3
 
diff --git a/middleware/packet-forward-middleware/go.mod b/middleware/packet-forward-middleware/go.mod
index e67e9302..2927c954 100644
--- a/middleware/packet-forward-middleware/go.mod
+++ b/middleware/packet-forward-middleware/go.mod
@@ -1,4 +1,4 @@
-go 1.21
+go 1.22
 
 toolchain go1.23.0
 
diff --git a/modules/async-icq/Dockerfile.icq b/modules/async-icq/Dockerfile.icq
index 31ea1be1..de63701d 100644
--- a/modules/async-icq/Dockerfile.icq
+++ b/modules/async-icq/Dockerfile.icq
@@ -2,7 +2,7 @@
 # make local-image-icq
 # docker run --rm -it icq-host:local q
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make go;
 
@@ -21,4 +21,4 @@ FROM alpine:3.18
 
 COPY --from=builder /go/build/* /bin/simd
 
-ENTRYPOINT ["/bin/simd"]
\ No newline at end of file
+ENTRYPOINT ["/bin/simd"]
diff --git a/modules/async-icq/Dockerfile.icq-demo b/modules/async-icq/Dockerfile.icq-demo
index 2a352748..2baab507 100644
--- a/modules/async-icq/Dockerfile.icq-demo
+++ b/modules/async-icq/Dockerfile.icq-demo
@@ -1,7 +1,7 @@
 # make local-image-icq-demo
 # docker run --rm -it icq-demo:local q interquery
 
-FROM golang:1.21-alpine3.18 as builder
+FROM golang:1.22-alpine3.20 as builder
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make go;
 
@@ -21,4 +21,4 @@ FROM alpine:3.18
 
 COPY --from=builder /go/build/* /bin/icq-demo
 
-ENTRYPOINT ["/bin/icq-demo"]
\ No newline at end of file
+ENTRYPOINT ["/bin/icq-demo"]