Skip to content

Commit 9466767

Browse files
shaspitzshaspitz
committed
Revert "Revert "Merge branch 'main' into add-go-mods""
This reverts commit b1c4f8f.
1 parent b1c4f8f commit 9466767

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+731
-156
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+37-31
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,49 @@
1-
# Description
1+
<!--
2+
The default pull request template is for types feat, fix, or refactor.
3+
For other templates, add one of the following parameters to the url:
4+
- template=docs.md
5+
- template=other.md
6+
-->
27

3-
Please include a summary of the changes and the related issue. If the issue was ambiguous try to clarify it in this section.
8+
## Description
49

5-
## Linked issues
10+
Closes: #XXXX
611

7-
Closes: `#<issue>`
12+
<!-- Add a description of the changes that this PR introduces and the files that
13+
are the most critical to review. -->
814

9-
## Type of change
15+
---
1016

11-
If you've checked more than one of the first three boxes, consider splitting this PR into multiple PRs!
17+
### Author Checklist
1218

13-
- [ ] `Feature`: Changes and/or adds code behavior, irrelevant to bug fixes
14-
- [ ] `Fix`: Changes and/or adds code behavior, specifically to fix a bug
15-
- [ ] `Refactor`: Changes existing code style, naming, structure, etc.
16-
- [ ] `Testing`: Adds testing
17-
- [ ] `Docs`: Adds documentation
19+
*All items are required. Please add a note to the item if the item is not applicable and
20+
please add links to any relevant follow up issues.*
1821

19-
## Regression tests
22+
I have...
2023

21-
If `Refactor`, describe the new or existing tests that verify no behavior was changed or added where refactors were introduced.
24+
* [ ] Included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
25+
* [ ] Added `!` to the type prefix if API or client breaking change
26+
* [ ] Targeted the correct branch (see [PR Targeting](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#pr-targeting))
27+
* [ ] Provided a link to the relevant issue or specification
28+
* [ ] Followed the guidelines for [building SDK modules](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules)
29+
* [ ] Included the necessary unit and integration [tests](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#testing)
30+
* [ ] Added a changelog entry to `CHANGELOG.md`
31+
* [ ] Included comments for [documenting Go code](https://blog.golang.org/godoc)
32+
* [ ] Updated the relevant documentation or specification
33+
* [ ] Reviewed "Files changed" and left comments if necessary <!-- relevant if the changes are not obvious -->
34+
* [ ] Confirmed all CI checks have passed
2235

23-
## New behavior tests
36+
### Reviewers Checklist
2437

25-
If `Feature` or `Fix`, describe the new or existing tests that verify the new behavior is correct and expected.
38+
*All items are required. Please add a note if the item is not applicable and please add
39+
your handle next to the items reviewed if you only reviewed selected items.*
2640

27-
## Versioning Implications
41+
I have...
2842

29-
- [ ] This PR will affect [semantic versioning as defined for ICS](../CONTRIBUTING.md#semantic-versioning)
30-
31-
If the above box is checked, which version should be bumped?
32-
33-
- [ ] `MAJOR`: Consensus breaking changes to both the provider and consumers(s), including updates/breaking changes to IBC communication between provider and consumer(s)
34-
- [ ] `MINOR`: Consensus breaking changes which affect either only the provider or only the consumer(s)
35-
- [ ] `PATCH`: Non consensus breaking changes
36-
37-
## Targeting
38-
39-
Please select one of the following:
40-
41-
- [ ] This PR is only relevant to main
42-
- [ ] This PR is relevant to main, and should also be back-ported to ____ (ex: v1.0.0 and v1.1.0)
43-
- [ ] This PR is only relevant to ____ (ex: v1.0.0, v1.1.0, and v1.2.0)
43+
* [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
44+
* [ ] confirmed `!` in the type prefix if API or client breaking change
45+
* [ ] confirmed all author checklist items have been addressed
46+
* [ ] reviewed state machine logic
47+
* [ ] reviewed API design and naming
48+
* [ ] reviewed documentation is accurate
49+
* [ ] reviewed tests and test coverage

‎.github/PULL_REQUEST_TEMPLATE/docs.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## Description
2+
3+
Closes: #XXXX
4+
5+
<!-- Add a description of the changes that this PR introduces and the files that
6+
are the most critical to review. -->
7+
8+
---
9+
10+
### Author Checklist
11+
12+
*All items are required. Please add a note to the item if the item is not applicable and
13+
please add links to any relevant follow up issues.*
14+
15+
I have...
16+
17+
- [ ] included the correct `docs:` prefix in the PR title
18+
- [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#pr-targeting))
19+
- [ ] provided a link to the relevant issue or specification
20+
- [ ] reviewed "Files changed" and left comments if necessary <!-- relevant if the changes are not obvious -->
21+
- [ ] confirmed all CI checks have passed
22+
23+
### Reviewers Checklist
24+
25+
*All items are required. Please add a note if the item is not applicable and please add
26+
your handle next to the items reviewed if you only reviewed selected items.*
27+
28+
I have...
29+
30+
- [ ] Confirmed the correct `docs:` prefix in the PR title
31+
- [ ] Confirmed all author checklist items have been addressed
32+
- [ ] Confirmed that this PR only changes documentation
33+
- [ ] Reviewed content for consistency
34+
- [ ] Reviewed content for spelling and grammar
35+
- [ ] Tested instructions (if applicable)
36+
- [ ] Checked that the documentation website can be built and deployed successfully (run `make build-docs`)
37+

‎.github/PULL_REQUEST_TEMPLATE/other.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
## Description
2+
3+
Closes: #XXXX
4+
5+
<!-- Add a description of the changes that this PR introduces and the files that
6+
are the most critical to review. -->
7+
8+
---
9+
10+
### Author Checklist
11+
12+
*All items are required. Please add a note to the item if the item is not applicable and
13+
please add links to any relevant follow up issues.*
14+
15+
I have...
16+
17+
- [ ] Included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
18+
- [ ] Targeted the correct branch (see [PR Targeting](https://github.com/cosmos/interchain-security/blob/main/CONTRIBUTING.md#pr-targeting))
19+
- [ ] Provided a link to the relevant issue or specification
20+
- [ ] Reviewed "Files changed" and left comments if necessary <!-- relevant if the changes are not obvious -->
21+
- [ ] Confirmed all CI checks have passed
22+
23+
### Reviewers Checklist
24+
25+
*All items are required. Please add a note if the item is not applicable and please add
26+
your handle next to the items reviewed if you only reviewed selected items.*
27+
28+
I have...
29+
30+
- [ ] Confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
31+
- [ ] Confirmed all author checklist items have been addressed
32+
- [ ] Confirmed that this PR does not change production code <!-- e.g., updating tests -->

‎.github/workflows/automated-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Go
2222
uses: actions/setup-go@v4
2323
with:
24-
go-version: "1.18.0" # The Go version to download (if necessary) and use.
24+
go-version: "1.20" # The Go version to download (if necessary) and use.
2525

2626
- name: Unit, integration and difference tests
2727
run: go test ./...

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: "1.18.0" # The Go version to download (if necessary) and use.
23+
go-version: "1.20" # The Go version to download (if necessary) and use.
2424
- name: Test with coverage
2525
run: go test -coverpkg=./x/... -coverprofile=coverage.out ./...
2626
- name: SonarCloud Scan

‎.github/workflows/golangci-lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.18
21+
go-version: "1.20"
2222
- uses: actions/checkout@v3
2323
- name: golangci-lint
2424
uses: golangci/golangci-lint-action@v3
@@ -30,7 +30,7 @@ jobs:
3030
# working-directory: somedir
3131

3232
# Optional: golangci-lint command line arguments.
33-
args: --timeout=20m --skip-dirs legacy_ibc_testing
33+
args: --config=.golangci.yml
3434

3535
# Optional: show only new issues if it's a pull request. The default value is `false`.
3636
# only-new-issues: true
@@ -43,4 +43,4 @@ jobs:
4343
# skip-pkg-cache: true
4444

4545
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
46-
# skip-build-cache: true
46+
# skip-build-cache: true

‎.github/workflows/manual-e2e.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/setup-go@v4
1313
with:
14-
go-version: '1.18'
14+
go-version: "1.20"
1515
- uses: actions/checkout@v3
1616

1717
- name: Checkout LFS objects
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Go
2121
uses: actions/setup-go@v4
2222
with:
23-
go-version: "1.18" # The Go version to download (if necessary) and use.
23+
go-version: "1.20" # The Go version to download (if necessary) and use.
2424

2525
- name: E2E tests
2626
run: make test-e2e

‎.github/workflows/nightly-e2e.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
# │ │ │ │ │
1616
# │ │ │ │ │
1717
# * * * * *
18-
- cron: '0 3 * * *'
18+
- cron: "0 3 * * *"
1919

2020
jobs:
2121
nightly-test:
@@ -24,14 +24,13 @@ jobs:
2424
steps:
2525
- uses: actions/setup-go@v4
2626
with:
27-
go-version: '1.18'
27+
go-version: "1.20"
2828

2929
- uses: actions/checkout@v3
3030

3131
- name: E2E tests
3232
run: make test-e2e
3333

34-
3534
nightly-test-fail:
3635
needs: nightly-test
3736
if: ${{ failure() }}

‎.golangci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ run:
33
timeout: 10m
44
sort-results: true
55
allow-parallel-runners: true
6-
exclude-dir: testutil/testdata
6+
skip-dirs:
7+
- "legacy_ibc_testing"
8+
- "testutil"
79

810
linters:
911
disable-all: true

0 commit comments

Comments
 (0)