support go1.17 and remove go1.15 (#2532)

pull/2558/head
fatedier 3 years ago committed by GitHub
parent 42745a3da2
commit a62a9431b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,16 +2,14 @@ version: 2
jobs: jobs:
go-version-latest: go-version-latest:
docker: docker:
- image: circleci/golang:1.16-node - image: cimg/go:1.17-node
working_directory: /go/src/github.com/fatedier/frp
steps: steps:
- checkout - checkout
- run: make - run: make
- run: make alltest - run: make alltest
go-version-last: go-version-last:
docker: docker:
- image: circleci/golang:1.15-node - image: cimg/go:1.16-node
working_directory: /go/src/github.com/fatedier/frp
steps: steps:
- checkout - checkout
- run: make - run: make

@ -17,7 +17,7 @@ jobs:
- name: Set up Go 1.x - name: Set up Go 1.x
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
- run: | - run: |
# https://github.com/actions/setup-go/issues/107 # https://github.com/actions/setup-go/issues/107

@ -15,7 +15,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:
go-version: 1.16 go-version: 1.17
- run: | - run: |
# https://github.com/actions/setup-go/issues/107 # https://github.com/actions/setup-go/issues/107

@ -5,7 +5,7 @@ ROOT=$(unset CDPATH && cd $(dirname "${BASH_SOURCE[0]}")/.. && pwd)
which ginkgo &> /dev/null which ginkgo &> /dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ginkgo not found, try to install..." echo "ginkgo not found, try to install..."
go get -u github.com/onsi/ginkgo/ginkgo go install github.com/onsi/ginkgo/ginkgo@latest
fi fi
debug=false debug=false

Loading…
Cancel
Save