Bump Go to 1.18 (#776)

Bump Go to 1.18
0xPolygon · Oct 5, 2022 · 690b4b4 · 690b4b4
1 parent daf3702
commit 690b4b4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 337 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -16,9 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18.x
       - name: Run tests
         run: make test-e2e
       - name: Archive test logs

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - name: Checkout code
         uses: actions/checkout@v3
@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - name: Checkout code
         uses: actions/checkout@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - name: Prepare
         id: prepare
@@ -44,11 +44,11 @@ jobs:
           		-v /var/run/docker.sock:/var/run/docker.sock \
           		-v `pwd`:/go/src/$(PACKAGE_NAME) \
           		-w /go/src/$(PACKAGE_NAME) \
-          		ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \
+          		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
           		--rm-dist --skip-validate
         env:
           PACKAGE_NAME: github.com/0xPolygon/polygon-edge
-          GOLANG_CROSS_VERSION: v1.17.2
+          GOLANG_CROSS_VERSION: v1.18.3
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ steps.prepare.outputs.tag_name }}
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine AS builder
+FROM golang:1.18-alpine AS builder
 
 WORKDIR /polygon-edge
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/0xPolygon/polygon-edge
 
-go 1.17
+go 1.18
 
 require (
 	github.com/btcsuite/btcd v0.22.1
@@ -60,7 +60,10 @@ require (
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
 
-require github.com/0xPolygon/go-ibft v0.0.0-20220810095021-e43142f8d267
+require (
+	github.com/0xPolygon/go-ibft v0.0.0-20220810095021-e43142f8d267
+	go.uber.org/atomic v1.10.0
+)
 
 require (
 	cloud.google.com/go v0.102.0 // indirect
@@ -168,7 +171,6 @@ require (
 	github.com/valyala/fasthttp v1.37.0 // indirect
 	github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect