chore: update to go 1.18 (#334)

* update to go 1.18 * add #334 to changelog * update go 1.17 to 1.18 * mod tidy 1.18 * update go get to go install * fix linter * go mod tidy 1.17 * fixing unknown field 'Instances' in struct literal of type types.Info * add #341 to changelog * checking codecov Co-authored-by: Facundo Medica <[email protected]>
umee-network · Aug 12, 2022 · eb07563 · eb07563
1 parent 344e0b9
commit eb07563
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
         env:
           GOOS: ${{ matrix.targetos }}
           GOARCH: ${{ matrix.arch }}

diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - uses: actions/checkout@v3
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Build
         uses: goreleaser/goreleaser-action@v3

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,12 +20,12 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Display Go Version
         run: go version
       - name: Install tparse
         run: |
-          export GO111MODULE="on" && go get github.com/mfridman/[email protected]
+          export GO111MODULE="on" && go install github.com/mfridman/[email protected]
       - uses: actions/cache@v3
         with:
           path: ~/go/bin
@@ -36,7 +36,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
         with:
@@ -49,18 +49,18 @@ jobs:
           make test-unit-cover
         if: env.GIT_DIFF
       - uses: codecov/codecov-action@v3
+        if: env.GIT_DIFF
         with:
           file: ./coverage.txt
           fail_ci_if_error: true
-        if: env.GIT_DIFF
 
   test-e2e:
     runs-on: ubuntu-latest
     timeout-minutes: 25
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - uses: actions/checkout@v3
       - uses: technote-space/[email protected]
         with:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,7 +6,7 @@ env:
 
 before:
   hooks:
-    - go mod tidy -compat=1.17
+    - go mod tidy -compat=1.18
 
 builds:
   - main: ./

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 [#275](https://github.com/umee-network/peggo/pull/275) Add diagrams of main loops.
 [#297](https://github.com/umee-network/peggo/pull/297) Update dependabot reviewers.
+[#334](https://github.com/umee-network/peggo/pull/334) Update to go 1.18.
 [#341](https://github.com/umee-network/peggo/pull/341) Fix linter.
 
 ### Bug Fixes

diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,23 @@
 ARG IMG_TAG=latest
 
+# Fetch base packages
+FROM golang:1.18-alpine AS base-builder
+ENV PACKAGES make git libc-dev gcc linux-headers
+RUN apk add --no-cache $PACKAGES
+
 # Compile the peggo binary
-FROM golang:1.17-alpine AS peggo-builder
+FROM base-builder AS peggo-builder
 WORKDIR /src/app/
 COPY go.mod go.sum* ./
 RUN go mod download
 COPY . .
-ENV PACKAGES make git libc-dev bash gcc linux-headers
 RUN apk add --no-cache $PACKAGES
 RUN make install
 
 # Fetch umeed binary
-FROM golang:1.17-alpine AS umeed-builder
+FROM base-builder AS umeed-builder
 ARG UMEE_VERSION=v2.0.0
-ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev
+ENV PACKAGES curl eudev-dev
 RUN apk add --no-cache $PACKAGES
 WORKDIR /downloads/
 RUN git clone https://github.com/umee-network/umee.git

diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ Peggo is a Go implementation of the Gravity Bridge Orchestrator originally
 implemented by [Injective Labs](https://github.com/InjectiveLabs/). Peggo itself
 is a fork of the original Gravity Bridge Orchestrator implemented by [Althea](https://github.com/althea-net).
 
-
 ## Table of Contents
 
 - [Dependencies](#dependencies)
@@ -24,7 +23,7 @@ is a fork of the original Gravity Bridge Orchestrator implemented by [Althea](ht
 
 ## Dependencies
 
-- [Go 1.17+](https://golang.org/dl/)
+- [Go 1.18+](https://golang.org/dl/)
 
 ## Installation
 
@@ -96,8 +95,8 @@ Any ERC20 token can be sent to Umee and it's done using the command
 `peggo bridge send-to-cosmos`, use the `--help` flag for more information. It
 can also be done by calling the `sendToCosmos` method on the Gravity Bridge contract.
 
-The ERC20 tokens will be locked in the Gravity Bridge contract and new coins will be
-minted on Umee with the denomination `gravity{token_address}`. This process takes
+The ERC20 tokens will be locked in the Gravity Bridge contract and new coins will
+be minted on Umee with the denomination `gravity{token_address}`. This process takes
 around 3 minutes or 12 Ethereum blocks.
 
 ## How it works

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/umee-network/peggo
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Gravity-Bridge/Gravity-Bridge/module v1.4.2-0.20220517191451-8d660b559b07
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ env: @@
     before:
       hooks:
-        - go mod tidy -compat=1.17
+        - go mod tidy -compat=1.18
     builds:
       - main: ./
@@ Expand Down @@