From d154a815f599ca82dfa8b43f1c70ef323cb69bed Mon Sep 17 00:00:00 2001 From: Daniel Burckhardt Date: Mon, 18 Jul 2022 13:49:56 +0200 Subject: [PATCH 1/2] ci(goreleaser): revert to make command (#783) add fixes from main --- .github/workflows/goreleaser.yml | 25 +++++++++++---------- Makefile | 37 ++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index bdec2db9d7..1bda08f33d 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -4,26 +4,25 @@ on: push: tags: - "v*.*.*" -permissions: - contents: read - jobs: goreleaser: - permissions: - contents: write # for goreleaser/goreleaser-action to create a GitHub release runs-on: ubuntu-latest + environment: release steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: actions/checkout@v3 with: - fetch-depth: 0 - - name: Install Go + submodules: true + - name: Set up Go uses: actions/setup-go@v3 with: go-version: 1.18 - - name: Create release - uses: goreleaser/goreleaser-action@v3 - with: - args: release --rm-dist + check-latest: true + - name: release dry run + run: make release-dry-run + - name: setup release environment env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: |- + echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env + - name: release publish + run: make release \ No newline at end of file diff --git a/Makefile b/Makefile index a63ce364e4..617d0e162b 100755 --- a/Makefile +++ b/Makefile @@ -566,6 +566,43 @@ localnet-show-logstream: .PHONY: build-docker-local-evmos localnet-start localnet-stop +############################################################################### +### Releasing ### +############################################################################### + +PACKAGE_NAME:=github.com/evmos/evmos +GOLANG_CROSS_VERSION = v1.18 +GOPATH ?= '$(HOME)/go' +release-dry-run: + docker run \ + --rm \ + --privileged \ + -e CGO_ENABLED=1 \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v `pwd`:/go/src/$(PACKAGE_NAME) \ + -v ${GOPATH}/pkg:/go/pkg \ + -w /go/src/$(PACKAGE_NAME) \ + ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ + --rm-dist --skip-validate --skip-publish --snapshot + +release: + @if [ ! -f ".release-env" ]; then \ + echo "\033[91m.release-env is required for release\033[0m";\ + exit 1;\ + fi + docker run \ + --rm \ + --privileged \ + -e CGO_ENABLED=1 \ + --env-file .release-env \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v `pwd`:/go/src/$(PACKAGE_NAME) \ + -w /go/src/$(PACKAGE_NAME) \ + ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \ + release --rm-dist --skip-validate + +.PHONY: release-dry-run release + ############################################################################### ### Compile Solidity Contracts ### ############################################################################### From db44f68bfb4e81537d064345455b29208cd1a407 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 26 Jul 2022 21:54:56 +0200 Subject: [PATCH 2/2] deps: bump ethermint to `v0.17.2` (backport #803) (#804) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: bump ethermint to v0.17.2 (#803) * deps: bump ethermint to v0.17.2 * backport label * c++ (cherry picked from commit d01d167f3e6ebb5c6ebbaf723d48624f63bea422) # Conflicts: # CHANGELOG.md * c++ Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> --- .mergify.yml | 8 ++++++++ CHANGELOG.md | 8 ++++++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 6a868edc2b..4084761778 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -16,6 +16,14 @@ pull_request_rules: commit_message_template: | {{ title }} (#{{ number }}) {{ body }} + - name: backport patches to v6.0.x branch + conditions: + - base=main + - label=backport/6.0.x + actions: + backport: + branches: + - release/v6.0.x - name: backport patches to v5.0.x branch conditions: - base=main diff --git a/CHANGELOG.md b/CHANGELOG.md index 01714b9b73..e2b127224d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,8 +35,16 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## [v6.0.3] - 2002-07-26 + +### Bug Fixes + +- (deps) [\#803](https://github.com/evmos/evmos/pull/803) Bump Ethermint version to [`v0.17.2`](https://github.com/evmos/ethermint/releases/tag/v0.17.2) + ## [v6.0.2] - 2022-07-13 +### Bug Fixes + - (deps) [\#769](https://github.com/evmos/evmos/pull/769) Bump Ethermint version to [`v0.17.1`](https://github.com/evmos/ethermint/releases/tag/v0.17.1) ## [v6.0.1] - 2022-06-28 diff --git a/go.mod b/go.mod index f85b547fd9..a1f0f86727 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/ibc-go/v3 v3.1.0 github.com/ethereum/go-ethereum v1.10.16 - github.com/evmos/ethermint v0.17.1 + github.com/evmos/ethermint v0.17.2 github.com/gogo/protobuf v1.3.3 github.com/golang/protobuf v1.5.2 github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index 26df2578c9..2d0e695c4a 100644 --- a/go.sum +++ b/go.sum @@ -333,8 +333,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/ethereum/go-ethereum v1.10.16 h1:3oPrumn0bCW/idjcxMn5YYVCdK7VzJYIvwGZUGLEaoc= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= -github.com/evmos/ethermint v0.17.1 h1:KXI4EXWQo8/PuzjBuhLRbgVhyz/Wzb0RoyZIHczZv90= -github.com/evmos/ethermint v0.17.1/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ= +github.com/evmos/ethermint v0.17.2 h1:OaXQmhKyKBw7EyR6JJaA6x9cApi3krqhYcKK1VuDOgo= +github.com/evmos/ethermint v0.17.2/go.mod h1:BmXULZy8lbld5KgNE0zM4b7Dy1irPpL6nsDH11SMNzQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=