Skip to content

Commit

Permalink
Merge branch 'main' into evan/msg-inclusion-api
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-forbes committed Aug 5, 2022
2 parents d9a0db6 + 0eef82b commit ddb5404
Show file tree
Hide file tree
Showing 49 changed files with 652 additions and 922 deletions.
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ Before we can merge this PR, please make sure that all the following items have
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting))
- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#pr-targeting))
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules/structure.md).
- [ ] Wrote unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing)
- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/building-modules/structure.md).
- [ ] Wrote unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/main/CONTRIBUTING.md#testing)
- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`)
- [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).
- [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md`
Expand Down
32 changes: 24 additions & 8 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,33 @@
pull_request_rules:
- name: backport patches to v0.5.x branch
- name: backport patches to v0.6.x branch
conditions:
- base=master
- label=S:backport-to-v0.5.x
- base=main
- label=S:backport-to-v0.6.x
actions:
backport:
branches:
- v0.5.x
- name: backport patches to v0.6.x branch
- v0.6.x
- name: backport patches to v0.7.x branch
conditions:
- base=master
- label=S:backport-to-v0.6.x
- base=main
- label=S:backport-to-v0.7.x
actions:
backport:
branches:
- v0.6.x
- v0.7.x
- name: backport patches to v0.8.x branch
conditions:
- base=main
- label=S:backport-to-v0.8.x
actions:
backport:
branches:
- v0.8.x
- name: backport patches to v0.9.x branch
conditions:
- base=main
- label=S:backport-to-v0.9.x
actions:
backport:
branches:
- v0.9.x
10 changes: 5 additions & 5 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ name: "docker-build"
on:
push:
branches:
- "master"
- "main"
workflow_dispatch:

jobs:
docker-build:
runs-on: "ubuntu-latest"
permissions:
contents: write
packages: write
contents: write
packages: write
steps:
- name: "Checkout source code"
uses: "actions/checkout@v3"
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: "Build"
run: "make build"
- name: Set up QEMU
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: "Build"
run: "make build"
- name: Set up QEMU
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: Lint
# Lint runs golangci-lint over the entire cosmos-sdk repository
# This workflow is run on every pull request and push to master
# This workflow is run on every pull request and push to main
# The `golangci` will pass without running if no *.{go, mod, sum} files have been changed.
on:
pull_request:
push:
branches:
- master
- main
jobs:
golangci:
name: golangci-lint
runs-on: ubuntu-latest
timeout-minutes: 8
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.17.1
with:
go-version: 1.18
- uses: actions/checkout@v3
- uses: technote-space/[email protected]
with:
Expand All @@ -25,9 +25,7 @@ jobs:
go.sum
- uses: golangci/[email protected]
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.42.1
version: v1.47.2
args: --timeout 10m
github-token: ${{ secrets.github_token }}
skip-go-installation: true
if: env.GIT_DIFF
22 changes: 22 additions & 0 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Markdown Lint

on:
push:
branches:
- main
pull_request:
release:
types: [published]

jobs:
markdown-lint:
name: Markdown Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 18
- run: |
npm install -g [email protected]
markdownlint --config .markdownlint.yaml **/*.md
21 changes: 20 additions & 1 deletion .github/workflows/proto.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Protobuf
# Protobuf runs buf (https://buf.build/) lint and check-breakage
# Protobuf runs buf (https://buf.build/) lint and generate
# This workflow is only run when a .proto file has been changed
on:
pull_request:
Expand All @@ -13,6 +13,25 @@ jobs:
- uses: actions/checkout@v3
- name: lint
run: make proto-lint
proto-gen:
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- name: "Check protobuf generated code matches committed code"
run: |
set -euo pipefail
make proto-gen
if ! git diff --stat --exit-code ; then
echo ">> ERROR:"
echo ">>"
echo ">> Protobuf generated code requires update (either tools or .proto files may have changed)."
echo ">> Ensure your tools are up-to-date, re-run 'make proto-gen' and update this PR."
echo ">>"
exit 1
fi
# add this back when we start using versioning
# breakage:
# runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: install runsim
run: |
export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -40,7 +40,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v3
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- master
- main

jobs:
cleanup-runs:
Expand All @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- run: make build
Expand All @@ -34,12 +34,12 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- name: Install runsim
run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/[email protected]
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -60,7 +60,7 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -88,7 +88,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -105,7 +105,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -116,7 +116,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand All @@ -133,7 +133,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- uses: technote-space/[email protected]
Expand All @@ -144,7 +144,7 @@ jobs:
go.sum
SET_ENV_NAME_INSERTIONS: 1
SET_ENV_NAME_LINES: 1
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-runsim-binary
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Unshallow
run: git fetch --prune --unshallow
- name: Create release
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Tests / Code Coverage
# Tests / Code Coverage workflow runs unit tests and uploads a code coverage report
# This workflow is run on pushes to master & every Pull Requests where a .go, .mod, .sum have been changed
# This workflow is run on pushes to main & every Pull Requests where a .go, .mod, .sum have been changed
on:
pull_request:
push:
branches:
- master
- main
jobs:
cleanup-runs:
runs-on: ubuntu-latest
Expand All @@ -20,13 +20,13 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.17
go-version: 1.18
- name: Display go version
run: go version
- name: install tparse
run: |
export GO111MODULE="on" && go install github.com/mfridman/[email protected]
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary
Expand All @@ -38,7 +38,7 @@ jobs:
# - uses: actions/checkout@v3
# - uses: actions/setup-go@v3
# with:
# go-version: 1.17
# go-version: 1.18
# - name: Display go version
# run: go version
# - uses: technote-space/[email protected]
Expand Down Expand Up @@ -91,7 +91,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 Expand Up @@ -169,7 +169,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 Expand Up @@ -218,7 +218,7 @@ jobs:
with:
name: "${{ github.sha }}-03-race-output"
if: env.GIT_DIFF
- uses: actions/[email protected].4
- uses: actions/[email protected].5
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary
Expand All @@ -235,7 +235,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]
# id: git_diff
# with:
Expand All @@ -251,4 +251,3 @@ jobs:
# run: |
# ./contrib/localnet_liveness.sh 100 5 50 localhost
# if: env.GIT_DIFF

Loading

0 comments on commit ddb5404

Please sign in to comment.