From f57adb8673d9b5e92417e31e6c82a51e596fd78a Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 27 Feb 2024 17:53:43 +0100
Subject: [PATCH 1/3] ci: run test pipeline on merge v0.50 branch

---
 .github/workflows/test.yml | 2 +-
 CHANGELOG.md               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 85c614129389..24ca58bfb2a4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
   merge_group:
   push:
     branches:
-      - main
+      - release/v0.50.x
 
 permissions:
   contents: read
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53cc76b34b5a..8b94e459ec92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 
 * (x/auth) [#19549](https://github.com/cosmos/cosmos-sdk/pull/19549) Accept custom get signers when injecting `x/auth/tx`.
-* (x/staking) Fix a possible bypass of delagator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
+* (x/staking) Fix a possible bypass of delegator slashing: [GHSA-86h5-xcpx-cfqc](https://github.com/cosmos/cosmos-sdk/security/advisories/GHSA-86h5-xcpx-cfqc)
 
 ## [v0.50.4](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.4) - 2024-02-19
 

From 8f6e2343e476870ac3ee4feca0a0eb683f4c100e Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 27 Feb 2024 17:58:10 +0100
Subject: [PATCH 2/3] `make lint-fix`

---
 testutil/sims/app_helpers.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/testutil/sims/app_helpers.go b/testutil/sims/app_helpers.go
index aa1fb843c763..7c7e6c942f1b 100644
--- a/testutil/sims/app_helpers.go
+++ b/testutil/sims/app_helpers.go
@@ -12,7 +12,6 @@ import (
 	dbm "github.com/cosmos/cosmos-db"
 
 	coreheader "cosmossdk.io/core/header"
-
 	"cosmossdk.io/depinject"
 	sdkmath "cosmossdk.io/math"
 
@@ -124,7 +123,7 @@ func NextBlock(app *runtime.App, ctx sdk.Context, jumpTime time.Duration) (sdk.C
 
 	header := ctx.BlockHeader()
 	header.Time = newBlockTime
-	header.Height = header.Height + 1
+	header.Height++
 
 	newCtx := app.BaseApp.NewUncachedContext(false, header).WithHeaderInfo(coreheader.Info{
 		Height: header.Height,

From 8ce5818a5006c6a1901be537573e03a3789b3703 Mon Sep 17 00:00:00 2001
From: Julien Robert <julien@rbrt.fr>
Date: Tue, 27 Feb 2024 18:05:33 +0100
Subject: [PATCH 3/3] other ci fix

---
 .github/workflows/pr_labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr_labeler.yml b/.github/workflows/pr_labeler.yml
index 885d8b47dbf6..b038490da237 100644
--- a/.github/workflows/pr_labeler.yml
+++ b/.github/workflows/pr_labeler.yml
@@ -12,7 +12,7 @@ jobs:
       pull-requests: write  # for actions/labeler to add labels to PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@main
+      - uses: actions/labeler@v4 # v5 is broken, ref https://github.com/actions/labeler/issues/712. Do not bump.
         with:
           configuration-path: .github/pr_labeler.yml
           repo-token: "${{ secrets.GITHUB_TOKEN }}"