feat: update golang up to 1.20.2

forestvpn · Mar 9, 2023 · 756c22f · 756c22f
1 parent 3d7ab00
commit 756c22f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 20 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -17,7 +17,7 @@ environment:
 
 steps:
   - name: deps
-    image: golang:1.18.4
+    image: golang:1.20.2
     volumes:
       - name: cache
         path: /cache
@@ -36,7 +36,7 @@ steps:
     commands:
       - git fetch --tags
   - name: test
-    image: golang:1.18.4
+    image: golang:1.20.2
     volumes:
       - name: cache
         path: /cache
@@ -48,7 +48,7 @@ steps:
       - cd src
       - go test ./...
   # - name: build-linux-arm64
-  #   image: golang:1.18.4
+  #   image: golang:1.20.2
   #   #chocolatey/choco:latest-linux
   #   environment:
   #     # GITHUB_TOKEN:
@@ -201,9 +201,9 @@ steps:
     commands:
       - apt update
       - apt install git wget -y
-      - wget -q https://go.dev/dl/go1.18.9.linux-amd64.tar.gz
-      - tar -xf go1.18.9.linux-amd64.tar.gz
-      - rm go1.18.9.linux-amd64.tar.gz
+      - wget -q https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
+      - tar -xf go1.20.2.linux-amd64.tar.gz
+      - rm go1.20.2.linux-amd64.tar.gz
       - chown -R root:root go
       - mv go /usr/local/
       - export PATH=$PATH:$GOPATH/bin
@@ -221,7 +221,7 @@ steps:
         exclude:
           - refs/tags/v*.*.*-beta*
   - name: beta-release
-    image: golang:1.18.4-bullseye
+    image: golang:1.20.2-bullseye
     environment:
       GITHUB_TOKEN:
         from_secret: GITHUB_TOKEN

diff --git a/src/go.mod b/src/go.mod
@@ -7,12 +7,11 @@ require (
 	github.com/forestvpn/api-client-go v0.0.0-20230206172414-8483332ba899
 	github.com/forestvpn/goauthlib v0.0.0-20230208053101-731e94fc9574
 	github.com/getsentry/sentry-go v0.13.0
-	github.com/go-resty/resty/v2 v2.7.0
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-retryablehttp v0.7.1
 	github.com/olekukonko/tablewriter v0.0.5
+	github.com/sirupsen/logrus v1.9.0
 	github.com/urfave/cli/v2 v2.17.1
-	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
 	golang.org/x/text v0.3.7
 	gopkg.in/ini.v1 v1.66.6
 )
@@ -24,9 +23,7 @@ require (
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
 	golang.org/x/sys v0.5.0 // indirect
 )
diff --git a/src/go.sum b/src/go.sum
@@ -14,8 +14,6 @@ github.com/forestvpn/goauthlib v0.0.0-20230208053101-731e94fc9574/go.mod h1:hBzG
 github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
 github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -61,25 +59,19 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb h1:pirldcYWx7rx7kE5r+9WsOXPXK0+WH5+uZ7uPmJ44uM=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

diff --git a/utils/ci_setup.sh b/utils/ci_setup.sh
@@ -3,4 +3,4 @@ set -eu
 
 GITHUB_TOKEN=${GITHUB_TOKEN:-""}
 
-git config --global url."https://${GITHUB_TOKEN}@github.com/forestvpn/".insteadOf "https://github.com/forestvpn/"
+git config --global url."https://token:${GITHUB_TOKEN}@github.com/forestvpn/".insteadOf "https://github.com/forestvpn/"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@ set -eu

		GITHUB_TOKEN=${GITHUB_TOKEN:-""}

		git config --global url."https://${GITHUB_TOKEN}@github.com/forestvpn/".insteadOf "https://github.com/forestvpn/"
		git config --global url."https://token:${GITHUB_TOKEN}@github.com/forestvpn/".insteadOf "https://github.com/forestvpn/"