Skip to content

Commit 1fc6dcd

Browse files
author
Sangyeop.lee
committed
Merge branch 'v2/develop' into sangyeop/v2/msg-empty
2 parents 4507ac3 + 9717c49 commit 1fc6dcd

File tree

3 files changed

+10
-30
lines changed

3 files changed

+10
-30
lines changed

.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
name: Tests / Code Coverage
22
# Tests / Code Coverage workflow runs unit tests and uploads a code coverage report
3-
# This workflow is run on pushes to master & every Pull Requests where a .go, .mod, .sum have been changed
3+
# This workflow is run on pushes to v2/develop & every Pull Requests where a .go, .mod, .sum have been changed
44
env:
55
GOPRIVATE: "github.com/line/*"
66

77
on:
88
pull_request:
99
push:
1010
branches:
11-
- master
11+
- v2/develop
1212
jobs:
1313
cleanup-runs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: rokroskar/workflow-run-cleanup-action@master
1717
env:
1818
GITHUB_TOKEN: "${{ secrets.TOKEN }}"
19-
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
19+
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/v2/develop'"
2020

2121
install-tparse:
2222
runs-on: ubuntu-latest
@@ -192,7 +192,7 @@ jobs:
192192
sed -i.bak "/$(echo $filename | sed 's/\//\\\//g')/d" coverage.txt
193193
done
194194
if: env.GIT_DIFF
195-
- uses: codecov/codecov-action@v1.2.1
195+
- uses: codecov/codecov-action@v1.5.0
196196
with:
197197
token: ${{ secrets.CODECOV_TOKEN }}
198198
file: ./coverage.txt

codecov.yml

+4-24
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,16 @@ codecov:
88
bot: Codecov bot for LINK
99

1010
comment:
11-
layout: "reach,diff,flags,tree"
11+
layout: "reach, diff, files"
1212
behavior: default # update if exists else create new
13-
require_changes: no
13+
require_changes: true
1414

1515
coverage:
1616
status:
1717
project:
1818
default:
19-
# basic
2019
target: 20
2120
threshold: 1% # allow this much decrease on project
22-
base: auto
23-
# advanced
24-
branches: null
25-
if_no_uploads: error
26-
if_not_found: success
27-
if_ci_failed: error
28-
only_pulls: false
29-
flags: null
30-
paths: null
3121
app:
3222
target: 70%
3323
flags:
@@ -58,14 +48,6 @@ flags:
5848
- "client/"
5949
- "x/**/client/"
6050

61-
parsers:
62-
gcov:
63-
branch_detection:
64-
conditional: yes
65-
loop: yes
66-
method: no
67-
macro: no
68-
6951
ignore:
7052
- "docs"
7153
- "*.md"
@@ -77,12 +59,10 @@ ignore:
7759
- "*_test.go"
7860
- "*.pb.go"
7961
- "*.pb.gw.go"
62+
- "scripts/"
8063
- "x/**/test_common.go"
8164
- "*_cmd.go"
82-
- "contrib/**/*"
83-
- "client/rpc/**/*_wrapper.go"
84-
- "client/rpc/**/*_alias.go"
85-
- "client/rpc/mock/*.go"
65+
- "contrib"
8666
- "statik.go"
8767
- "root.go"
8868
- "x/**/module.go"

simapp/simd/cmd/root.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ func (a appCreator) newApp(logger log.Logger, db tmdb.DB, traceStore io.Writer,
192192
baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))),
193193
baseapp.SetHaltTime(cast.ToUint64(appOpts.Get(server.FlagHaltTime))),
194194
baseapp.SetMinRetainBlocks(cast.ToUint64(appOpts.Get(server.FlagMinRetainBlocks))),
195-
baseapp.SetInterBlockCache(cache),
196195
baseapp.SetIAVLCacheManager(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
197-
baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
196+
baseapp.SetInterBlockCache(cache),
198197
baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
198+
baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))),
199199
baseapp.SetSnapshotStore(snapshotStore),
200200
baseapp.SetSnapshotInterval(cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval))),
201201
baseapp.SetSnapshotKeepRecent(cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent))),

0 commit comments

Comments
 (0)