forked from Finschia/finschia-sdk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into simapp_with_wasm
* 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
Showing
317 changed files
with
4,599 additions
and
6,056 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/[email protected] | ||
| 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 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
|
@@ -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/[email protected] | ||
|
|
@@ -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 | ||
|
|
@@ -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/[email protected] | ||
|
|
@@ -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 | ||
|
|
@@ -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/[email protected] | ||
|
|
@@ -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/[email protected] | ||
| 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/[email protected] | ||
| 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/[email protected].5 | ||
| # - uses: actions/[email protected].3 | ||
| # with: | ||
| # go-version: 1.15 | ||
| # - uses: technote-space/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.