Skip to content

Commit ee8335c

Browse files
authored
Merge branch 'main' into feat/geth-1.15
2 parents 9a01568 + 28bc916 commit ee8335c

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/lint.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,23 @@ jobs:
4646
4747
BUILD_TAGS=rocksdb,grocksdb_clean_link,objstore
4848
go build -tags $BUILD_TAGS ./cmd/cronosd
49-
golangci-lint run --output.text.path stdout --path-prefix=./ --timeout 30m --build-tags $BUILD_TAGS
49+
golangci-lint run --fix --output.text.path stdout --path-prefix=./ --timeout 30m --build-tags $BUILD_TAGS
5050
cd versiondb
51-
golangci-lint run --output.text.path stdout --path-prefix=./versiondb --timeout 30m --build-tags $BUILD_TAGS
51+
golangci-lint run --fix --output.text.path stdout --path-prefix=./versiondb --timeout 30m --build-tags $BUILD_TAGS
5252
cd ../memiavl
53-
golangci-lint run --output.text.path stdout --path-prefix=./memiavl --timeout 30m --build-tags objstore
53+
golangci-lint run --fix --output.text.path stdout --path-prefix=./memiavl --timeout 30m --build-tags objstore
5454
cd ../store
55-
golangci-lint run --output.text.path stdout --path-prefix=./store --timeout 30m --build-tags objstore
55+
golangci-lint run --fix --output.text.path stdout --path-prefix=./store --timeout 30m --build-tags objstore
5656
# Check only if there are differences in the source code
5757
if: steps.changed-files.outputs.any_changed == 'true'
58+
- name: check working directory is clean
59+
id: changes
60+
run: |
61+
set +e
62+
(git diff --no-ext-diff --exit-code)
63+
echo "changed=$?" >> $GITHUB_OUTPUT
64+
- if: steps.changes.outputs.changed == 1
65+
run: echo "Working directory is dirty" && exit 1
5866

5967
lint-python:
6068
name: Lint python

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
### Improvements
11-
11+
* [#1841](https://github.com/crypto-org-chain/cronos/pull/1841) Ci: use `golangci-lint run --fix`.
1212
* [#1779](https://github.com/crypto-org-chain/cronos/pull/1779) Upgrade rocksdb to `v9.11.2`.
1313
* [#1824](https://github.com/crypto-org-chain/cronos/pull/1824) Rework on github actions.
1414
* [#1826](https://github.com/crypto-org-chain/cronos/pull/1826) Update linter and tidy up code.

0 commit comments

Comments
 (0)