From a62a9431b1c8330009c6bd2f9afec1edcfc635f1 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Tue, 17 Aug 2021 15:26:43 +0800
Subject: [PATCH] support go1.17 and remove go1.15 (#2532)

---
 .circleci/config.yml                       | 6 ++----
 .github/workflows/build-and-push-image.yml | 2 +-
 .github/workflows/goreleaser.yml           | 2 +-
 hack/run-e2e.sh                            | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f95e79..b8f1980 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,16 +2,14 @@ version: 2
 jobs:
   go-version-latest:
     docker:
-      - image: circleci/golang:1.16-node
-    working_directory: /go/src/github.com/fatedier/frp
+      - image: cimg/go:1.17-node
     steps:
       - checkout
       - run: make
       - run: make alltest
   go-version-last:
     docker:
-      - image: circleci/golang:1.15-node
-    working_directory: /go/src/github.com/fatedier/frp
+      - image: cimg/go:1.16-node
     steps:
       - checkout
       - run: make
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
index 852f7df..ef43625 100644
--- a/.github/workflows/build-and-push-image.yml
+++ b/.github/workflows/build-and-push-image.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
 
       - run: |
           # https://github.com/actions/setup-go/issues/107
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
index 15d5499..a58546a 100644
--- a/.github/workflows/goreleaser.yml
+++ b/.github/workflows/goreleaser.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16
+          go-version: 1.17
           
       - run: |
           # https://github.com/actions/setup-go/issues/107
diff --git a/hack/run-e2e.sh b/hack/run-e2e.sh
index 7fb9d64..ee39665 100755
--- a/hack/run-e2e.sh
+++ b/hack/run-e2e.sh
@@ -5,7 +5,7 @@ ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd)
 which ginkgo &> /dev/null
 if [ $? -ne 0 ]; then
     echo "ginkgo not found, try to install..."
-    go get -u github.com/onsi/ginkgo/ginkgo
+    go install github.com/onsi/ginkgo/ginkgo@latest
 fi
 
 debug=false