From 51b8d3a1533ffb77744d7a248842ec0b46ad77f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Oct 2020 14:13:45 +0200 Subject: [PATCH] build(deps): Bump technote-space/get-diff-action from v3 to v4 (#5485) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marko Baricevic --- .github/workflows/coverage.yml | 80 +++++++++++++++------------------- .github/workflows/e2e.yml | 12 +++-- .github/workflows/lint.yaml | 12 ++--- .github/workflows/tests.yml | 70 +++++++++++++---------------- state/export_test.go | 3 +- 5 files changed, 80 insertions(+), 97 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 7174c1b35..60495a3d1 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -38,101 +38,93 @@ jobs: needs: split-test-files steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 - with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + - uses: technote-space/get-diff-action@v4 + with: + PATTERNS: | + **/**.go + go.mod + go.sum - uses: actions/download-artifact@v2 with: name: "${{ github.sha }}-aa" - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test & coverage report creation run: | cat xaa.txt | xargs go test -mod=readonly -timeout 8m -race -coverprofile=coverage.txt -covermode=atomic - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: codecov/codecov-action@v1.0.13 with: file: ./coverage.txt - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test-coverage-part-2: runs-on: ubuntu-latest needs: split-test-files steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 - with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + - uses: technote-space/get-diff-action@v4 + with: + PATTERNS: | + **/**.go + go.mod + go.sum - uses: actions/download-artifact@v2 with: name: "${{ github.sha }}-ab" - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test & coverage report creation run: | cat xab.txt | xargs go test -mod=readonly -timeout 5m -race -coverprofile=coverage.txt -covermode=atomic - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: codecov/codecov-action@v1.0.13 with: file: ./coverage.txt - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test-coverage-part-3: runs-on: ubuntu-latest needs: split-test-files steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 - with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + - uses: technote-space/get-diff-action@v4 + with: + PATTERNS: | + **/**.go + go.mod + go.sum - uses: actions/download-artifact@v2 with: name: "${{ github.sha }}-ac" - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test & coverage report creation run: | cat xac.txt | xargs go test -mod=readonly -timeout 10m -race -coverprofile=coverage.txt -covermode=atomic - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: codecov/codecov-action@v1.0.13 with: file: ./coverage.txt - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test-coverage-part-4: runs-on: ubuntu-latest needs: split-test-files steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 - with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + - uses: technote-space/get-diff-action@v4 + with: + PATTERNS: | + **/**.go + go.mod + go.sum - uses: actions/download-artifact@v2 with: name: "${{ github.sha }}-ad" - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test & coverage report creation run: | cat xad.txt | xargs go test -mod=readonly -timeout 5m -race -coverprofile=coverage.txt -covermode=atomic - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: codecov/codecov-action@v1.0.13 with: file: ./coverage.txt - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 574349579..55a04d4a2 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -14,14 +14,12 @@ jobs: timeout-minutes: 15 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + PATTERNS: | + **/**.go + go.mod + go.sum - name: Build working-directory: test/e2e diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 130f1024c..fb537d489 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -14,16 +14,16 @@ jobs: timeout-minutes: 4 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum + PATTERNS: | + **/**.go + go.mod + go.sum - uses: golangci/golangci-lint-action@v2.2.1 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.30 args: --timeout 10m github-token: ${{ secrets.github_token }} - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 38ed24270..5e5e75e25 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,14 +24,12 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + PATTERNS: | + **/**.go + go.mod + go.sum - name: Set GOBIN run: | echo "::add-path::$(go env GOPATH)/bin" @@ -44,13 +42,13 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF # Cache binaries for use by other jobs - uses: actions/cache@v2.1.2 with: path: ~/go/bin key: ${{ runner.os }}-${{ github.sha }}-tm-binary - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test_abci_apps: runs-on: ubuntu-latest @@ -58,14 +56,12 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + PATTERNS: | + **/**.go + go.mod + go.sum - name: Set GOBIN run: | echo "::add-path::$(go env GOPATH)/bin" @@ -75,16 +71,16 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: actions/cache@v2.1.2 with: path: ~/go/bin key: ${{ runner.os }}-${{ github.sha }}-tm-binary - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test_abci_apps run: abci/tests/test_app/test.sh shell: bash - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test_abci_cli: runs-on: ubuntu-latest @@ -92,14 +88,12 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + PATTERNS: | + **/**.go + go.mod + go.sum - name: Set GOBIN run: | echo "::add-path::$(go env GOPATH)/bin" @@ -109,15 +103,15 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: actions/cache@v2.1.2 with: path: ~/go/bin key: ${{ runner.os }}-${{ github.sha }}-tm-binary - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - run: abci/tests/test_cli/test.sh shell: bash - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF test_apps: runs-on: ubuntu-latest @@ -125,14 +119,12 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v2 - - uses: technote-space/get-diff-action@v3 + - uses: technote-space/get-diff-action@v4 with: - SUFFIX_FILTER: | - .go - .mod - .sum - SET_ENV_NAME_INSERTIONS: 1 - SET_ENV_NAME_LINES: 1 + PATTERNS: | + **/**.go + go.mod + go.sum - name: Set GOBIN run: | echo "::add-path::$(go env GOPATH)/bin" @@ -142,13 +134,13 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - uses: actions/cache@v2.1.2 with: path: ~/go/bin key: ${{ runner.os }}-${{ github.sha }}-tm-binary - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF - name: test_apps run: test/app/test.sh shell: bash - if: "env.GIT_DIFF != ''" + if: env.GIT_DIFF diff --git a/state/export_test.go b/state/export_test.go index c7de6c5c2..56c3d764c 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -1,11 +1,12 @@ package state import ( + dbm "github.com/tendermint/tm-db" + abci "github.com/tendermint/tendermint/abci/types" tmstate "github.com/tendermint/tendermint/proto/tendermint/state" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" ) //