Merge branch 'main' into adam/display

umee-network · Sep 25, 2023 · 85177c7 · 85177c7
2 parents 0ef0011 + 9c1f366
commit 85177c7
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Improvements
+
+- [2261](https://github.com/umee-network/umee/pull/2261) Use go 1.21
+
 ### Bug Fixes
 
 - [2260](https://github.com/umee-network/umee/pull/2260) fix(oracle): avg params storage.

diff --git a/contrib/images/umee.e2e-static.dockerfile b/contrib/images/umee.e2e-static.dockerfile
@@ -2,7 +2,7 @@
 # Creates static binaries, by building from the latest version of:
 # umeed, price-feeder.
 
-FROM golang:1.20-alpine AS builder
+FROM golang:1.21-alpine3.18 AS builder
 ENV PACKAGES make git gcc linux-headers build-base curl
 RUN apk add --no-cache $PACKAGES
 
@@ -25,7 +25,7 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make install && \
 
 
 ## Prepare the final clear binary
-FROM alpine:latest
+FROM alpine:3.18
 EXPOSE 26656 26657 1317 9090 7171
 ENTRYPOINT ["umeed", "start"]
 

diff --git a/contrib/images/umee.e2e.dockerfile b/contrib/images/umee.e2e.dockerfile
@@ -1,7 +1,7 @@
 # Docker for e2e testing
 # Creates dynamic binaries, by building from the latest version of umeed
 
-FROM golang:1.20-bookworm AS builder
+FROM golang:1.21-bookworm AS builder
 ARG EXPERIMENTAL=true
 
 ## Download go module dependencies for umeed

diff --git a/contrib/images/umeed.dockerfile b/contrib/images/umeed.dockerfile
@@ -1,7 +1,7 @@
 # Stage-1: build
 # We use Debian Bullseye rather then Alpine because Alpine has problem building libwasmvm
 # - requires to download libwasmvm_muslc from external source. Build with glibc is straightforward.
-FROM golang:1.20-bookworm AS builder
+FROM golang:1.21-bookworm AS builder
 
 WORKDIR /src/
 # optimization: if go.sum didn't change, docker will use cached image

diff --git a/contrib/scripts/go-mod-tidy-all.sh b/contrib/scripts/go-mod-tidy-all.sh
@@ -5,5 +5,5 @@ set -euo pipefail
 for modfile in $(find . -name go.mod); do
  echo "Updating $modfile"
  DIR=$(dirname $modfile)
- (cd $DIR; go mod tidy --compat=1.20)
+ (cd $DIR; go mod tidy --compat=1.21)
 done
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/umee-network/umee/v6
 
-go 1.20
+go 1.21
 
 require (
 	cosmossdk.io/errors v1.0.0

diff --git a/go.sum b/go.sum
diff --git a/tests/e2e/docker/gaia.Dockerfile b/tests/e2e/docker/gaia.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20-alpine
+FROM golang:1.21-alpine
 ARG GAIA_VERSION=v5.0.7
 
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers