Skip to content

Commit

Permalink
close 815: upgrade to go 1.18 (#866)
Browse files Browse the repository at this point in the history
* close 815: upgrade to go 1.18

* Update CHANGELOG.md

* updater ci and docker to go 1.18

* update image per: https://discuss.circleci.com/t/legacy-convenience-image-deprecation/41034

* Update config.yml

* go get -> go install, except dockerfile for protos
  • Loading branch information
faddat authored Aug 24, 2022
1 parent b62b7ac commit 61bda97
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 88 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ version: 2.1
executors:
golang:
docker:
- image: circleci/golang:1.17
working_directory: /go/src/github.com/cosmwasm/wasmd
- image: cimg/go:1.18

commands:
make:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD)
- Upgrade go to v1.18 [\#866]https://github.com/CosmWasm/wasmd/pull/866/) ([faddat](https://github.com/faddat))



[Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.28.0...HEAD)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# docker build . -t cosmwasm/wasmd:latest
# docker run --rm -it cosmwasm/wasmd:latest /bin/sh
FROM golang:1.17-alpine3.15 AS go-builder
FROM golang:1.18-alpine3.15 AS go-builder
ARG arch=x86_64

# this comes from standard alpine nightly file
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ go.sum: go.mod

draw-deps:
@# requires brew install graphviz or apt-get install graphviz
go get github.com/RobotsAndPencils/goviz
go install github.com/RobotsAndPencils/goviz
@goviz -i ./cmd/wasmd -d 2 | dot -Tpng -o dependency-graph.png

clean:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This code was forked from the `cosmos/gaia` repository as a basis and then we ad
many gaia-specific files. However, the `wasmd` binary should function just like `gaiad` except for the
addition of the `x/wasm` module.

**Note**: Requires [Go 1.17+](https://golang.org/dl/)
**Note**: Requires [Go 1.18+](https://golang.org/dl/)

For critical security issues & disclosure, see [SECURITY.md](SECURITY.md).
## Compatibility with CosmWasm contracts
Expand Down
6 changes: 3 additions & 3 deletions contrib/devtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ tools-stamp: statik runsim golangci-lint
statik: $(STATIK)
$(STATIK):
@echo "Installing statik..."
@(cd /tmp && go get github.com/rakyll/[email protected])
@(cd /tmp && go install github.com/rakyll/[email protected])

# Install the runsim binary with a temporary workaround of entering an outside
# directory as the "go get" command ignores the -mod option and will polute the
Expand All @@ -71,12 +71,12 @@ $(STATIK):
runsim: $(RUNSIM)
$(RUNSIM):
@echo "Installing runsim..."
@(cd /tmp && go get github.com/cosmos/tools/cmd/[email protected])
@(cd /tmp && go install github.com/cosmos/tools/cmd/[email protected])

golangci-lint: $(GOLANGCI_LINT)
$(GOLANGCI_LINT):
@echo "Installing golangci-lint..."
@(cd /tmp && go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.28.0)
@(cd /tmp && go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2)

tools-clean:
rm -f $(STATIK) $(GOLANGCI_LINT) $(RUNSIM)
Expand Down
2 changes: 1 addition & 1 deletion contrib/prototools-docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN GO111MODULE=on go get \

RUN upx --lzma /usr/local/bin/*

FROM golang:1.17.3-alpine
FROM golang:1.18-alpine
ENV LD_LIBRARY_PATH=/lib64:/lib

WORKDIR /work
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CosmWasm/wasmd

go 1.17
go 1.18

require (
github.com/CosmWasm/wasmvm v1.0.0
Expand Down
78 changes: 1 addition & 77 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/protocgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ protoc_gen_gocosmos() {
return 1
fi

go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2>/dev/null
go install github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest 2>/dev/null
}

protoc_gen_gocosmos
Expand Down

0 comments on commit 61bda97

Please sign in to comment.