Skip to content

Commit

Permalink
Merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
mmulji-ic committed Jan 15, 2024
2 parents ef516d3 + 536a617 commit 248328b
Show file tree
Hide file tree
Showing 122 changed files with 1,094 additions and 642 deletions.
3 changes: 3 additions & 0 deletions .changelog/v13.0.1/bug-fixes/2771-bump-pfm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [PFM](https://github.com/cosmos/ibc-apps/tree/main/middleware)
to [v4.1.1](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.1)
([\#2771](https://github.com/cosmos/gaia/pull/2771))
3 changes: 3 additions & 0 deletions .changelog/v13.0.1/dependencies/2771-bump-pfm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Bump [PFM](https://github.com/cosmos/ibc-apps/tree/main/middleware)
to [v4.1.1](https://github.com/cosmos/ibc-apps/releases/tag/middleware%2Fpacket-forward-middleware%2Fv4.1.1)
([\#2771](https://github.com/cosmos/gaia/pull/2771))
1 change: 1 addition & 0 deletions .changelog/v13.0.1/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*October 25, 2023*
4 changes: 4 additions & 0 deletions .changelog/v13.0.2/bug-fixes/2763-ledger-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- Bump [cosmos/ledger-cosmos-go](https://github.com/cosmos/ledger-cosmos-go) to
[v0.12.4](https://github.com/cosmos/ledger-cosmos-go/releases/tag/v0.12.4)
to fix signing with ledger through the binary on newest versions of macOS and Xcode
([\#2763](https://github.com/cosmos/gaia/pull/2763))
1 change: 1 addition & 0 deletions .changelog/v13.0.2/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*November 7, 2023*
1 change: 1 addition & 0 deletions .changelog/v14.0.0/api-breaking/2814-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Deprecate equivocation proposals of ICS provider module ([\#2814](https://github.com/cosmos/gaia/pull/2814))
1 change: 1 addition & 0 deletions .changelog/v14.0.0/dependencies/2814-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Bump [ICS] to [v2.3.0-provider-lsm](https://github.com/cosmos/interchain-security/releases/tag/v2.3.0-provider-lsm) ([\#2814](https://github.com/cosmos/gaia/pull/2814))
1 change: 1 addition & 0 deletions .changelog/v14.0.0/features/2814-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Introducing the cryptographic verification of equivocation feature to the ICS provider module ([\#2814](https://github.com/cosmos/gaia/pull/2814))
1 change: 1 addition & 0 deletions .changelog/v14.0.0/state-breaking/2814-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Bump [ICS] to [v2.3.0-provider-lsm](https://github.com/cosmos/interchain-security/releases/tag/v2.3.0-provider-lsm) ([\#2814](https://github.com/cosmos/gaia/pull/2814))
3 changes: 3 additions & 0 deletions .changelog/v14.0.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*November 15, 2023*

***This release is deprecated and should not be used in production. Use v14.1.0 instead.***
1 change: 1 addition & 0 deletions .changelog/v14.1.0/api-breaking/2825-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Deprecate equivocation proposals of ICS provider module ([\#2825](https://github.com/cosmos/gaia/pull/2825))
1 change: 1 addition & 0 deletions .changelog/v14.1.0/dependencies/2825-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Bump [ICS] to [v2.4.0-lsm](https://github.com/cosmos/interchain-security/releases/tag/v2.4.0-lsm) ([\#2825](https://github.com/cosmos/gaia/pull/2825))
3 changes: 3 additions & 0 deletions .changelog/v14.1.0/features/2821-evidence-height.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Set in the v14 upgrade handler the min evidence height for `neutron-1`
at `4552189` and for `stride-1` at `6375035`.
([\#2821](https://github.com/cosmos/gaia/pull/2821))
1 change: 1 addition & 0 deletions .changelog/v14.1.0/features/2825-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Introducing the cryptographic verification of equivocation feature to the ICS provider module ([\#2825](https://github.com/cosmos/gaia/pull/2825))
1 change: 1 addition & 0 deletions .changelog/v14.1.0/state-breaking/2825-bump-ics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Bump [ICS] to [v2.4.0-lsm](https://github.com/cosmos/interchain-security/releases/tag/v2.4.0-lsm) ([\#2825](https://github.com/cosmos/gaia/pull/2825))
2 changes: 2 additions & 0 deletions .changelog/v14.1.0/summary.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*November 21, 2023*

6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v13.x"
target-branch: "release/v14.1.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -31,7 +31,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v12.x"
target-branch: "release/v13.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -41,7 +41,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v11.x"
target-branch: "release/v12.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"
check-latest: true

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: "go"
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -44,7 +44,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -58,4 +58,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5.0.0
uses: docker/metadata-action@v5.5.0
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@v5.0.0
uses: docker/build-push-action@v5.1.0
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Build and push e2e docker image
uses: docker/build-push-action@v5.0.0
uses: docker/build-push-action@v5.1.0
with:
context: .
file: Dockerfile.e2e
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"
check-latest: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
newbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- name: Install runsim
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
needs: newbuild
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: technote-space/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fetch-depth: 0
- run: git fetch --force --tags

- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sim-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
newbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- name: Install runsim
Expand All @@ -31,7 +31,7 @@ jobs:
needs: newbuild
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: actions/[email protected]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sims.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- name: Install runsim
Expand All @@ -34,7 +34,7 @@ jobs:
needs: newbuild
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: technote-space/[email protected]
Expand All @@ -58,7 +58,7 @@ jobs:
needs: build
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: technote-space/get-diff-action@v6
Expand All @@ -80,7 +80,7 @@ jobs:
newbuild:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- name: Install runsim
Expand All @@ -105,7 +105,7 @@ jobs:
runs-on: ubuntu-latest
needs: [build, install-runsim]
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8.0.0
- uses: actions/stale@v9.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.20"
check-latest: true
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
if: env.GIT_DIFF
run: |
go test -v -coverprofile=profile.out -covermode=atomic -coverpkg=./... $(go list ./... | grep -v -e '/tests/e2e')
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: env.GIT_DIFF
with:
name: "${{ github.sha }}-coverage"
Expand All @@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: actions/checkout@v4
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
go.sum
**/go.mod
**/go.sum
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: env.GIT_DIFF
with:
name: "${{ github.sha }}-coverage"
Expand All @@ -108,7 +108,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
- uses: technote-space/[email protected]
Expand Down Expand Up @@ -143,13 +143,13 @@ jobs:
**/**.go
go.mod
go.sum
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: 1.20.x
# the old gaiad binary version is hardcoded, need to be updated each major release.
- name: Install Old Gaiad
run: |
git checkout v13.0.0
git checkout v14.0.0
make build
cp ./build/gaiad ./build/gaiadold
go clean -modcache
Expand Down
18 changes: 9 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ pull_request_rules:
{{ title }} (#{{ number }})
{{ body }}
- name: Backport patches to the release/v11.x branch
- name: Backport patches to the release/v12.x branch
conditions:
- base=main
- label=A:backport/v11.x
- label=A:backport/v12.x
actions:
backport:
branches:
- release/v11.x
- release/v12.x

- name: Backport patches to the release/v12.x branch
- name: Backport patches to the release/v13.x branch
conditions:
- base=main
- label=A:backport/v12.x
- label=A:backport/v13.x
actions:
backport:
branches:
- release/v12.x
- release/v13.x

- name: Backport patches to the release/v13.x branch
- name: Backport patches to the release/v14.1.x branch
conditions:
- base=main
- label=A:backport/v13.x
- label=A:backport/v14.1.x
actions:
backport:
branches:
- release/v13.x
- release/v14.1.x
Loading

0 comments on commit 248328b

Please sign in to comment.