From 83e7fae7dc97a7498a74383ff7f4b28cf328bafd Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 30 Mar 2022 17:02:49 +0700 Subject: [PATCH 1/2] update to go1.18 --- .github/workflows/build.yml | 2 +- .github/workflows/sim.yml | 2 +- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 +- go.mod | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a6ce426cca..c9b2d77f6a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2.1.4 with: - go-version: '^1.17' + go-version: '^1.18' env: GOOS: ${{ matrix.targetos }} GOARCH: ${{ matrix.arch }} diff --git a/.github/workflows/sim.yml b/.github/workflows/sim.yml index 8c7e2c6950e..04616183fa8 100644 --- a/.github/workflows/sim.yml +++ b/.github/workflows/sim.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2.1.4 with: - go-version: 1.17 + go-version: 1.18 - name: Display go version run: go version - name: Run simulation diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5eddfb80ddd..f5d66f490c0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2.1.4 with: - go-version: 1.17 + go-version: 1.18 - name: Display go version run: go version - name: Run all tests @@ -48,7 +48,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.17 + go-version: 1.18 - uses: technote-space/get-diff-action@v6.0.1 id: git_diff with: diff --git a/Dockerfile b/Dockerfile index 1507c522b64..022e5105bef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ## Build Image -FROM golang:1.17-bullseye as build +FROM golang:1.18-bullseye as build WORKDIR /osmosis COPY . /osmosis diff --git a/go.mod b/go.mod index defb3138f8d..1187a1c22c2 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module github.com/osmosis-labs/osmosis/v7 -go 1.17 +go 1.18 require ( - github.com/CosmWasm/wasmd v0.23.0 + github.com/CosmWasm/wasmd v0.24.0 github.com/cosmos/cosmos-sdk v0.45.1 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/iavl v0.17.3 From 8f88468b5a0594f85ea5c6e171a4fa6048439e86 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 30 Mar 2022 17:52:30 +0700 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98321c37384..ab16a1e7eea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,7 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#1107](https://github.com/osmosis-labs/osmosis/pull/1107) Update to wasmvm v0.24.0, re-enabling building on M1 macs! ### Minor improvements & Bug Fixes - +* [#1177](https://github.com/osmosis-labs/osmosis/pull/1177) upgrade to go 1.18 * [#1061](https://github.com/osmosis-labs/osmosis/pull/1061) upgrade iavl to v0.17.3-osmo-v5 with concurrent map write fix * [#1071](https://github.com/osmosis-labs/osmosis/pull/1071) improve Dockerfile * [#1095](https://github.com/osmosis-labs/osmosis/pull/1095) Fix authz being unable to use lockup & superfluid types.