Skip to content

Commit

Permalink
Merge branch 'v2/develop' into sangyeop/v2/msg-empty
Browse files Browse the repository at this point in the history
  • Loading branch information
Sangyeop.lee committed May 11, 2021
2 parents 4507ac3 + 9717c49 commit 1fc6dcd
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 30 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
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 v2/develop & every Pull Requests where a .go, .mod, .sum have been changed
env:
GOPRIVATE: "github.com/line/*"

on:
pull_request:
push:
branches:
- master
- v2/develop
jobs:
cleanup-runs:
runs-on: ubuntu-latest
steps:
- uses: rokroskar/workflow-run-cleanup-action@master
env:
GITHUB_TOKEN: "${{ secrets.TOKEN }}"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/v2/develop'"

install-tparse:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
done
if: env.GIT_DIFF
- uses: codecov/codecov-action@v1.2.1
- uses: codecov/codecov-action@v1.5.0
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage.txt
Expand Down
28 changes: 4 additions & 24 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,16 @@ codecov:
bot: Codecov bot for LINK

comment:
layout: "reach,diff,flags,tree"
layout: "reach, diff, files"
behavior: default # update if exists else create new
require_changes: no
require_changes: true

coverage:
status:
project:
default:
# basic
target: 20
threshold: 1% # allow this much decrease on project
base: auto
# advanced
branches: null
if_no_uploads: error
if_not_found: success
if_ci_failed: error
only_pulls: false
flags: null
paths: null
app:
target: 70%
flags:
Expand Down Expand Up @@ -58,14 +48,6 @@ flags:
- "client/"
- "x/**/client/"

parsers:
gcov:
branch_detection:
conditional: yes
loop: yes
method: no
macro: no

ignore:
- "docs"
- "*.md"
Expand All @@ -77,12 +59,10 @@ ignore:
- "*_test.go"
- "*.pb.go"
- "*.pb.gw.go"
- "scripts/"
- "x/**/test_common.go"
- "*_cmd.go"
- "contrib/**/*"
- "client/rpc/**/*_wrapper.go"
- "client/rpc/**/*_alias.go"
- "client/rpc/mock/*.go"
- "contrib"
- "statik.go"
- "root.go"
- "x/**/module.go"
Expand Down
4 changes: 2 additions & 2 deletions simapp/simd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ func (a appCreator) newApp(logger log.Logger, db tmdb.DB, traceStore io.Writer,
baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))),
baseapp.SetHaltTime(cast.ToUint64(appOpts.Get(server.FlagHaltTime))),
baseapp.SetMinRetainBlocks(cast.ToUint64(appOpts.Get(server.FlagMinRetainBlocks))),
baseapp.SetInterBlockCache(cache),
baseapp.SetIAVLCacheManager(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
baseapp.SetInterBlockCache(cache),
baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
baseapp.SetSnapshotStore(snapshotStore),
baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))),
baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))),
Expand Down

0 comments on commit 1fc6dcd

Please sign in to comment.