Merge branch 'release/v5.2.x' of https://github.com/cosmos/ibc-go int…

…o v5.2.0-icq

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,18 +12,41 @@ are the most critical to review.
 
 closes: #XXXX
 
+
+### Commit Message / Changelog Entry
+
+```bash
+type: commit message
+```
+
+see the [guidelines](../CONTRIBUTING.md#commit-messages) for commit messages. (view raw markdown for examples)
+
+
+<!--
+Example commit messages:
+
+fix: skip emission of unpopulated memo field in ics20
+deps: updating sdk to v0.46.4
+chore: removed unused variables
+e2e: adding e2e upgrade test for ibc-go/v6
+docs: ics27 v6 documentation updates
+feat: add semantic version utilities for e2e tests
+feat(api)!: this is an api breaking feature
+fix(statemachine)!: this is a statemachine breaking fix
+-->
+
 ---
 
 Before we can merge this PR, please make sure that all the following items have been
 checked off. If any of the checklist items are not applicable, please leave them but
 write a little note why.
 
-- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting))
+- [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting)).
 - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
 - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md).
-- [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing)
-- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`)
+- [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing).
+- [ ] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`).
 - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).
-- [ ] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md`
-- [ ] Re-reviewed `Files changed` in the Github PR explorer
-- [ ] Review `Codecov Report` in the comment section below once CI passes
+- [ ] Provide a [commit message](../CONTRIBUTING.md#commit-messages) to be used for the changelog entry in the PR description for review.
+- [ ] Re-reviewed `Files changed` in the Github PR explorer.
+- [ ] Review `Codecov Report` in the comment section below once CI passes.

.github/workflows/release.yml

@@ -51,4 +51,5 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            IBC_GO_VERSION=${{ github.ref_name }}

.github/workflows/test.yml

@@ -52,6 +52,13 @@ jobs:
       - name: Build
         run: GOARCH=${{ matrix.go-arch }} LEDGER_ENABLED=false make build
 
+  docker-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Docker Build
+        run: docker build . --no-cache --build-arg IBC_GO_VERSION=v5.2.0
+
   split-test-files:
     runs-on: ubuntu-latest
     steps:

CHANGELOG.md

@@ -28,12 +28,41 @@ Types of changes (Stanzas):
 "Bug Fixes" for any bug fixes.
 "Client Breaking" for breaking CLI commands and REST routes used by end-users.
 "API Breaking" for breaking exported APIs used by developers building on SDK.
-"State Machine Breaking" for any changes that result in a different AppState given same genesisState and txList.
+"State Machine Breaking" for any changes that result in a different AppState given the same genesisState and txList.
 Ref: https://keepachangelog.com/en/1.0.0/
 -->
 
 # Changelog
 
+## [Unreleased]
+
+### Dependencies
+
+### API Breaking
+
+### State Machine Breaking
+
+### Improvements
+
+### Features
+
+### Bug Fixes
+
+## [v5.2.0](https://github.com/cosmos/ibc-go/releases/tag/v5.2.0) - 2022-12-20
+
+### Dependencies
+
+* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ICS 23 to v0.9.0. 
+* [\#2944](https://github.com/cosmos/ibc-go/pull/2944) Bump Cosmos SDK to v0.46.7 and Tendermint to v0.34.24.
+
+### State Machine Breaking
+
+* (apps/29-fee) [\#2942](https://github.com/cosmos/ibc-go/pull/2942) Check `x/bank` send enabled before escrowing fees.
+
+### Improvements
+
+* (apps/29-fee) [\#2786](https://github.com/cosmos/ibc-go/pull/2786) Save gas by checking key existence with `KVStore`'s `Has` method.
+
 ## [v5.1.0](https://github.com/cosmos/ibc-go/releases/tag/v5.1.0) - 2022-11-09
 
 ### Dependencies

CONTRIBUTING.md

@@ -85,6 +85,29 @@ All PRs require an approval from at least one CODEOWNER before merge. PRs which
 - If you sat down with the PR submitter and did a pairing review please note that in the `Approval`, or your PR comments.
 - If you are only making "surface level" reviews, submit any notes as `Comments` without adding a review.
 
+### Commit Messages
+
+Commit messages should be [conventional](https://www.conventionalcommits.org/en/v1.0.0/).
+
+If opening a PR, include the proposed commit message in the PR description.
+
+The commit message type should be one of:
+
+* `feat` / `feature` for feature work.
+* `bug` / `fix` for bug fixes.
+* `imp` / `improvements` for improvements.
+* `doc` / `docs` / `documentation` for any documentation changes.
+* `test` / `e2e` for addition or improvements of unit, integration and e2e tests or their corresponding infrastructure.
+* `deprecated` for deprecation changes.
+* `deps` / `build` for changes to dependencies.
+* `chore` / `misc` / `nit` for any miscellaneous changes that don't fit into another category.
+
+**Note**: If any change is breaking, the following format must be used:
+* `type` + `(api)!` for api breaking changes, e.g. `fix(api)!: api breaking fix`
+* `type` + `(statemachine)!` for state machine breaking changes, e.g. `fix(statemachine)!: state machine breaking fix`
+
+**`api` breaking changes take precedence over `statemachine` breaking changes.**
+
 ### Updating Documentation
 
 If you open a PR on ibc-go, it is mandatory to update the relevant documentation in /docs.

Dockerfile

@@ -1,8 +1,13 @@
-FROM golang:1.18 as builder
+FROM golang:1.19 as builder
+
+ARG IBC_GO_VERSION
 
 ENV GOPATH=""
 ENV GOMODULE="on"
 
+# ensure the ibc go version is being specified for this image.
+RUN test -n "${IBC_GO_VERSION}"
+
 COPY go.mod .
 COPY go.sum .
 
@@ -18,6 +23,10 @@ RUN make build
 
 FROM ubuntu:20.04
 
+ARG IBC_GO_VERSION
+
+LABEL "org.cosmos.ibc-go" "${IBC_GO_VERSION}"
+
 COPY --from=builder /go/build/simd /bin/simd
 
 ENTRYPOINT ["simd"]

Makefile

@@ -209,6 +209,10 @@ view-docs:
 		@cd docs && \
     npm install && npm run serve
 
+
+changelog:
+	docker run --rm -v "$$(pwd)"/.git:/app/ -v "$$(pwd)/cliff.toml":/app/cliff.toml orhunp/git-cliff:latest --unreleased --tag $(tag)
+
 .PHONY: build-docs
 
 ###############################################################################