Skip to content

Commit

Permalink
Merge branch 'main' into simapp_with_wasm
Browse files Browse the repository at this point in the history
* main:
  fix: `make proto-format` bug in the Makefile (Finschia#438)
  feat: Revert sig_block_height (Finschia#434)
  build(deps): bump actions/setup-go from 2.1.5 to 2.2.0 (Finschia#432)
  build(deps): bump github.com/prometheus/client_golang (Finschia#424)
  chore: remove `x/wasm/linkwasmd` (Finschia#436)
  build(deps): bump github.com/VictoriaMetrics/fastcache (Finschia#429)
  fix: apply fix from release branch (Finschia#428)

# Conflicts:
#	CHANGELOG.md
  • Loading branch information
zemyblue committed Feb 16, 2022
2 parents 23ecfa4 + 7947e4c commit c7fa27e
Show file tree
Hide file tree
Showing 317 changed files with 4,599 additions and 6,056 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- uses: golangci/golangci-lint-action@master
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.28
version: v1.39
args: --timeout 10m
github-token: ${{ secrets.GITHUB_TOKEN }}
if: env.GIT_DIFF
12 changes: 9 additions & 3 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@ on:
- "**.proto"
jobs:
lint:
name: proto-lint(clang-format)
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@master
- name: lint
run: make proto-lint
- uses: actions/checkout@v2
- uses: DoozyX/clang-format-lint-action@v0.13
with:
source: '.'
exclude: './third_party'
extensions: 'proto'
clangFormatVersion: 12
inplace: True
# TODO ebony: release comment after merging initial proto files to v2 branch
# breakage:
# runs-on: ubuntu-latest
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -51,7 +51,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -78,7 +78,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims_normal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip-sims')"
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -39,7 +39,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -57,7 +57,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand All @@ -75,7 +75,7 @@ jobs:
needs: [build, install-runsim]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Install Go
uses: actions/setup-go@v2.1.5
uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Unshallow
Expand Down
59 changes: 14 additions & 45 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
install-tparse:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- name: Display go version
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
- run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt
if: "matrix.package != ''"
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand All @@ -68,7 +68,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - uses: actions/setup-go@v2.1.5
# - uses: actions/setup-go@v2.2.0
# with:
# go-version: 1.15
# - name: Display go version
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand All @@ -135,6 +135,9 @@ jobs:
name: "${{ github.sha }}-${{ matrix.part }}"
if: env.GIT_DIFF
- name: test & coverage report creation
env:
USE_PRELOAD: 1,4
SAVE_BRANCH_LAUNCH_DEPTH: 1
run: |
cat pkgs.txt.part.${{ matrix.part }} | xargs go test -mod=readonly -timeout 30m -coverprofile=${{ matrix.part }}profile.out -covermode=atomic -tags='norace ledger test_ledger_mock goleveldb'
if: env.GIT_DIFF
Expand Down Expand Up @@ -198,7 +201,7 @@ jobs:
part: ["00", "01", "02", "03"]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2.1.5
- uses: actions/setup-go@v2.2.0
with:
go-version: 1.15
- uses: technote-space/get-diff-action@v6.0.1
Expand All @@ -212,59 +215,25 @@ jobs:
name: "${{ github.sha }}-${{ matrix.part }}"
if: env.GIT_DIFF
- name: test & coverage report creation
env:
USE_PREFETCH: NO
USE_PRELOAD: 1,4
SAVE_BRANCH_LAUNCH_DEPTH: 1
run: |
xargs --arg-file=pkgs.txt.part.${{ matrix.part }} go test -mod=readonly -json -timeout 30m -race -tags='cgo ledger test_ledger_mock goleveldb' | tee ${{ matrix.part }}-race-output.txt
xargs --arg-file=pkgs.txt.part.${{ matrix.part }} go test -mod=readonly -timeout 30m -race -tags='cgo ledger test_ledger_mock goleveldb'
if: env.GIT_DIFF
- uses: actions/upload-artifact@v2
with:
name: "${{ github.sha }}-${{ matrix.part }}-race-output"
path: ./${{ matrix.part }}-race-output.txt

race-detector-report:
runs-on: ubuntu-latest
needs: [test-race, install-tparse]
timeout-minutes: 5
steps:
- uses: actions/checkout@v2
- uses: technote-space/get-diff-action@v6.0.1
id: git_diff
with:
PATTERNS: |
**/**.go
go.mod
go.sum
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-00-race-output"
if: env.GIT_DIFF
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-01-race-output"
if: env.GIT_DIFF
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-02-race-output"
if: env.GIT_DIFF
- uses: actions/download-artifact@v2
with:
name: "${{ github.sha }}-03-race-output"
if: env.GIT_DIFF
- uses: actions/cache@v2.1.7
with:
path: ~/go/bin
key: ${{ runner.os }}-go-tparse-binary
if: env.GIT_DIFF
- name: Generate test report (go test -race)
run: cat ./*-race-output.txt | ~/go/bin/tparse
if: env.GIT_DIFF

# TODO ebony: enable this test
# liveness-test:
# runs-on: ubuntu-latest
# timeout-minutes: 10
# steps:
# - uses: actions/checkout@v2
# - uses: actions/setup-go@v2.1.5
# - uses: actions/setup-go@v2.1.3
# with:
# go-version: 1.15
# - uses: technote-space/get-diff-action@v6.0.1
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ issues:
- text: "ST1016:"
linters:
- stylecheck
- text: "SA1019: codec.LegacyAmino is deprecated"
linters:
- staticcheck
max-issues-per-linter: 10000
max-same-issues: 10000

Expand Down
Loading

0 comments on commit c7fa27e

Please sign in to comment.