Skip to content

Commit

Permalink
Bumpy bumpy (#1584)
Browse files Browse the repository at this point in the history
* bump sdk version

* go change

* bump go versions

* Update test.yml

* Update sims.yml

* Update e2e.Dockerfile

* Update sims.yml

* Update sims.yml

* Update lint.yml

* Update release-sims.yml

* Update release-sims.yml

* change go get to go install

* update all to v1.18

* one last update to go

* add back cacheing to workflow

* unreleased changelog and add back cache workflow

* docs: add release time to changelog

* docs: update installation docs

* Update installation.md

Updated version numbers in console output

Co-authored-by: billy rennekamp <[email protected]>
Co-authored-by: Yaru Wang <[email protected]>
Co-authored-by: Milan Mulji <[email protected]>
  • Loading branch information
4 people authored Jul 26, 2022
1 parent 62930d2 commit 3439e67
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand All @@ -40,7 +40,7 @@ jobs:
steps:
- name: install runsim
run: |
export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand All @@ -66,7 +66,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
go-version: 1.16
go-version: 1.18
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sim-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.16
go-version: 1.18
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand All @@ -33,7 +33,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
go-version: 1.16
go-version: 1.18
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- name: Install runsim
run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
run: go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand All @@ -33,7 +33,7 @@ jobs:
# - uses: actions/[email protected]
# - uses: actions/[email protected]
# with:
# go-version: 1.17
# go-version: 1.18
# - uses: technote-space/[email protected]
# with:
# PATTERNS: |
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- uses: actions/[email protected]
with:
path: ~/go/bin
Expand All @@ -80,7 +80,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- uses: actions/[email protected]
- uses: technote-space/[email protected]
with:
Expand All @@ -105,7 +105,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand All @@ -130,7 +130,7 @@ jobs:
- uses: actions/[email protected]
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18
- uses: technote-space/[email protected]
with:
PATTERNS: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18

- uses: actions/[email protected]

Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: 1.17
go-version: 1.18

- uses: actions/checkout@v2

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

## [v7.0.3] -2022-07-28

* (gaia) bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to [v0.45.6](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.6). See [CHANGELOG.md](https://github.com/cosmos/cosmos-sdk/blob/v0.45.6/CHANGELOG.md#v0456---2022-06-28) for details.
* (gaia) bump [liquidity](https://github.com/gravity-devs/liquidity) to [v1.5.1](https://github.com/Gravity-Devs/liquidity/releases/tag/v1.5.1) to be compatible with cosmos-sdk v0.45.6.

## [v7.0.2] -2022-05-09

* (gaia) bump [cosmos-sdk](https://github.com/cosmos/cosmos-sdk) to [v0.45.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.45.4). See [CHANGELOG.md](https://github.com/cosmos/cosmos-sdk/blob/v0.45.4/CHANGELOG.md#v0454---2022-04-25) for details.
Expand Down Expand Up @@ -433,6 +438,7 @@ See the [Tendermint v0.34.7 SDK changelog](https://github.com/tendermint/tenderm
<!-- Release links -->

[Unreleased]: https://github.com/cosmos/gaia/compare/v7.0.3...HEAD
[v7.0.3]: https://github.com/cosmos/gaia/releases/tag/v7.0.3
[v7.0.2]: https://github.com/cosmos/gaia/releases/tag/v7.0.2
[v7.0.1]: https://github.com/cosmos/gaia/releases/tag/v7.0.1
[v7.0.0]: https://github.com/cosmos/gaia/releases/tag/v7.0.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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/gaiad -d 2 | dot -Tpng -o dependency-graph.png

clean:
Expand Down
3 changes: 1 addition & 2 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ func NewGaiaApp(
app.GetSubspace(liquiditytypes.ModuleName),
app.BankKeeper,
app.AccountKeeper,
app.DistrKeeper,
)
app.DistrKeeper)

// register the staking hooks
// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
Expand Down
2 changes: 1 addition & 1 deletion contrib/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# > docker build -t gaia .
# > docker run -it -p 46657:46657 -p 46656:46656 -v ~/.gaia:/root/.gaia gaia gaiad init
# > docker run -it -p 46657:46657 -p 46656:46656 -v ~/.gaia:/root/.gaia gaia gaiad start
FROM golang:1.17-alpine AS build-env
FROM golang:1.18-alpine AS build-env

# Set up dependencies
ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3
Expand Down
4 changes: 2 additions & 2 deletions contrib/devtools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ tools-stamp: $(RUNSIM)
touch $@

# 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
# directory as the "go intall" command ignores the -mod option and will polute the
# go.{mod, sum} files.
#
# ref: https://github.com/golang/go/issues/30515
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])

protoc:
@echo "Installing protoc compiler..."
Expand Down
12 changes: 6 additions & 6 deletions docs/getting-started/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sudo apt-get install -y make gcc
## Install Go

::: tip
**Go 1.16+** or later is required for the Cosmos SDK.
**Go 1.18+** or later is required for the Cosmos SDK.
:::

We suggest the following two ways to install Go. Check out the [official docs](https://golang.org/doc/install) and Go installer for the correct download for your operating system. Alternatively, you can install Go yourself from the command line. Detailed below are standard default installation locations, but feel free to customize.
Expand All @@ -38,11 +38,11 @@ We suggest the following two ways to install Go. Check out the [official docs](h

**Ubuntu:**

At the time of this writing, the latest release is `1.17.4`. We're going to download the tarball, extract it to `/usr/local`, and export `GOROOT` to our `$PATH`
At the time of this writing, the latest release is `1.18.4`. We're going to download the tarball, extract it to `/usr/local`, and export `GOROOT` to our `$PATH`
```bash
curl -OL https://golang.org/dl/go1.17.4.linux-amd64.tar.gz
curl -OL https://golang.org/dl/go1.18.4.linux-amd64.tar.gz

sudo tar -C /usr/local -xvf go1.17.4.linux-amd64.tar.gz
sudo tar -C /usr/local -xvf go1.18.4.linux-amd64.tar.gz

export PATH=$PATH:/usr/local/go/bin

Expand Down Expand Up @@ -93,10 +93,10 @@ You should see something similar to the following:
```bash
name: gaia
server_name: gaiad
version: v6.0.0
version: v7.0.3
commit: 07f9892a927f451ae204d0c9d1a5601d8fc232a5
build_tags: netgo,ledger
go: go version go1.15 linux/amd64
go: go version go1.18.3 linux/amd64
```

### Build Tags
Expand Down
2 changes: 1 addition & 1 deletion e2e.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG IMG_TAG=latest

# Compile the gaiad binary
FROM golang:1.17-alpine AS gaiad-builder
FROM golang:1.18-alpine AS gaiad-builder
WORKDIR /src/app/
COPY go.mod go.sum* ./
RUN go mod download
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/cosmos/gaia/v7

go 1.17
go 1.18

require (
github.com/cosmos/cosmos-sdk v0.45.4
github.com/cosmos/cosmos-sdk v0.45.6
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/ibc-go/v3 v3.0.0
github.com/golangci/golangci-lint v1.45.2
github.com/gorilla/mux v1.8.0
github.com/gravity-devs/liquidity v1.5.0
github.com/gravity-devs/liquidity v1.5.1
github.com/ory/dockertest/v3 v3.8.1
github.com/rakyll/statik v0.1.7
github.com/spf13/cast v1.4.1
Expand Down
Loading

0 comments on commit 3439e67

Please sign in to comment.