Merge branch 'master' into minor-changes

FDio · Jun 27, 2024 · 6ae2175 · 6ae2175
2 parents a1c7339 + 8532cee
commit 6ae2175
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: "Setup Go"
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - name: "Run Tests"
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -36,7 +36,7 @@ RUN set -eux; \
     rm -rf /var/lib/apt/lists/*; \
     rm -rf /pkg
 
-FROM golang:1.21-alpine3.19 as binapi-generator
+FROM golang:1.22-alpine3.19 as binapi-generator
 
 ENV GO111MODULE=on
 ENV CGO_ENABLED=0

diff --git a/core/connection.go b/core/connection.go
@@ -548,10 +548,10 @@ func (c *Connection) retrieveMessageIDs() (err error) {
 			n++
 			nn++
 
-			if c.pingReqID == 0 && msg.GetMessageName() == c.msgControlPing.GetMessageName() {
+			if msg.GetMessageName() == c.msgControlPing.GetMessageName() {
 				c.pingReqID = msgID
 				c.msgControlPing = reflect.New(reflect.TypeOf(msg).Elem()).Interface().(api.Message)
-			} else if c.pingReplyID == 0 && msg.GetMessageName() == c.msgControlPingReply.GetMessageName() {
+			} else if msg.GetMessageName() == c.msgControlPingReply.GetMessageName() {
 				c.pingReplyID = msgID
 				c.msgControlPingReply = reflect.New(reflect.TypeOf(msg).Elem()).Interface().(api.Message)
 			}

diff --git a/test/build/Dockerfile.integration b/test/build/Dockerfile.integration
@@ -1,15 +1,15 @@
-FROM buildpack-deps:20.04-scm
+FROM buildpack-deps:22.04-scm
 
 # Install gotestsum
-ARG GOTESTSUM_VERSION=1.10.0
+ARG GOTESTSUM_VERSION=1.12.0
 RUN set -eux; \
     curl -fsSL https://github.com/gotestyourself/gotestsum/releases/download/v${GOTESTSUM_VERSION}/gotestsum_${GOTESTSUM_VERSION}_linux_amd64.tar.gz -o gotestsum.tar.gz; \
     tar -xf gotestsum.tar.gz gotestsum; \
     mv gotestsum /usr/local/bin/gotestsum; \
     rm gotestsum.tar.gz;
 
 # Install Go
-ENV GOLANG_VERSION 1.20
+ENV GOLANG_VERSION 1.22.4
 
 RUN set -eux; \
 	dpkgArch="$(dpkg --print-architecture)"; \