From ad0a9ee8849b999b32b6c9c2946d63bd3f5dccbf Mon Sep 17 00:00:00 2001
From: Rod Hynes <rod-hynes@users.noreply.github.com>
Date: Tue, 2 Aug 2022 10:49:27 -0400
Subject: [PATCH] Use Go 1.17.13

---
 .github/workflows/tests.yml                  | 2 +-
 ClientLibrary/Dockerfile                     | 2 +-
 ClientLibrary/build-darwin.sh                | 4 ++--
 ConsoleClient/Dockerfile                     | 2 +-
 MobileLibrary/Android/Dockerfile             | 2 +-
 MobileLibrary/iOS/build-psiphon-framework.sh | 2 +-
 Server/Dockerfile-binary-builder             | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 630b2071c..fb5295be2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu" ]
-        go: [ "1.17.11" ]
+        go: [ "1.17.13" ]
         test-type: [ "detector", "coverage", "memory" ]
 
     runs-on: ${{ matrix.os }}-latest
diff --git a/ClientLibrary/Dockerfile b/ClientLibrary/Dockerfile
index f1363810c..e1d1fb370 100644
--- a/ClientLibrary/Dockerfile
+++ b/ClientLibrary/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
 
 # Install Go.
 # NOTE: Go 1.10+ is required to build c-shared for windows (https://github.com/golang/go/commit/bb0bfd002ada7e3eb9198d4287b32c2fed6e8da6)
-ENV GOVERSION=go1.17.11 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.17.13 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
    && tar -C /usr/local -xzf /tmp/go.tar.gz \
diff --git a/ClientLibrary/build-darwin.sh b/ClientLibrary/build-darwin.sh
index 4ac5afeff..999503e21 100755
--- a/ClientLibrary/build-darwin.sh
+++ b/ClientLibrary/build-darwin.sh
@@ -9,9 +9,9 @@ if [ -z ${2+x} ]; then BUILD_TAGS=""; else BUILD_TAGS="$2"; fi
 # Note:
 #   clangwrap.sh needs to be updated when the Go version changes.
 #   The last version was:
-#   https://github.com/golang/go/blob/go1.17.11/misc/ios/clangwrap.sh
+#   https://github.com/golang/go/blob/go1.17.13/misc/ios/clangwrap.sh
 #     - with a patch to lower -mios-version-min to 7.0
-GO_VERSION_REQUIRED="1.17.11"
+GO_VERSION_REQUIRED="1.17.13"
 
 # At this time, we don't support modules
 export GO111MODULE=off
diff --git a/ConsoleClient/Dockerfile b/ConsoleClient/Dockerfile
index eb03d6272..0bbad5c1f 100644
--- a/ConsoleClient/Dockerfile
+++ b/ConsoleClient/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.17.11 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.17.13 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
    && tar -C /usr/local -xzf /tmp/go.tar.gz \
diff --git a/MobileLibrary/Android/Dockerfile b/MobileLibrary/Android/Dockerfile
index c0835436c..a882eb0bb 100644
--- a/MobileLibrary/Android/Dockerfile
+++ b/MobileLibrary/Android/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.17.11 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.17.13 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
   && tar -C /usr/local -xzf /tmp/go.tar.gz \
diff --git a/MobileLibrary/iOS/build-psiphon-framework.sh b/MobileLibrary/iOS/build-psiphon-framework.sh
index a3f0ac13d..35a0d3476 100755
--- a/MobileLibrary/iOS/build-psiphon-framework.sh
+++ b/MobileLibrary/iOS/build-psiphon-framework.sh
@@ -5,7 +5,7 @@ set -e -u -x
 if [ -z ${1+x} ]; then BUILD_TAGS=""; else BUILD_TAGS="$1"; fi
 
 # Modify this value as we use newer Go versions.
-GO_VERSION_REQUIRED="1.17.11"
+GO_VERSION_REQUIRED="1.17.13"
 
 # At this time, psiphon-tunnel-core doesn't support modules
 export GO111MODULE=off
diff --git a/Server/Dockerfile-binary-builder b/Server/Dockerfile-binary-builder
index 6cd879609..3a4b35843 100644
--- a/Server/Dockerfile-binary-builder
+++ b/Server/Dockerfile-binary-builder
@@ -1,6 +1,6 @@
 FROM alpine:3.10.2
 
-ENV GOLANG_VERSION 1.17.11
+ENV GOLANG_VERSION 1.17.13
 ENV GOLANG_SRC_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
 
 RUN set -ex \