chore: Replacing v5.0.0 upgrade handler with v5.0.2 (#499)

* bumping up upgrade handler version * bump interchanintest + run it on release branches too * Update CHANGELOG.md * hardcode which image tag to use * 🙏
archway-network · Nov 7, 2023 · ba51126 · ba51126
1 parent 75443a6
commit ba51126
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/.github/workflows/interchaintest.yaml b/.github/workflows/interchaintest.yaml
@@ -4,6 +4,7 @@ on:
     pull_request:
         branches: 
             - main
+            - 'releases/**'
 
 jobs:
     build_images:
@@ -16,10 +17,6 @@ jobs:
               with:
                 fetch-depth: 0
 
-            - name: Get last release tag
-              id: lastrelease
-              uses: revam/gh-action-get-tag-and-version@v1
-
             - name: Checkout heighliner
               uses: actions/checkout@v3
               with:
@@ -47,14 +44,14 @@ jobs:
                 image: archway:local
                 retention_days: 3
 
-            - name: Build ${{ steps.lastrelease.outputs.tag }} image
+            - name: Build v4.0.2 image
               run: |
-                heighliner build --org archway-network --repo archway --dockerfile cosmos --build-target "make build" --build-env "BUILD_TAGS=muslc" --binaries "build/archwayd" --git-ref ${{ steps.lastrelease.outputs.tag }} --chain archway --tag ${{ steps.lastrelease.outputs.tag }}
+                heighliner build --org archway-network --repo archway --dockerfile cosmos --build-target "make build" --build-env "BUILD_TAGS=muslc" --binaries "build/archwayd" --git-ref v4.0.2 --chain archway --tag v4.0.2
             
-            - name: Upload ${{ steps.lastrelease.outputs.tag }} image
+            - name: Upload v4.0.2 image
               uses: ishworkh/[email protected]
               with:
-                image: archway:${{ steps.lastrelease.outputs.tag }}
+                image: archway:v4.0.2
                 retention_days: 3
 
     run_chain_upgrade_test:
@@ -85,17 +82,13 @@ jobs:
             - name: Load current image
               run: docker load --input archway_local
 
-            - name: Get last release tag
-              id: lastrelease
-              uses: revam/gh-action-get-tag-and-version@v1
-
-            - name: Download ${{ steps.lastrelease.outputs.tag }} image
+            - name: Download v4.0.2 image
               uses: actions/download-artifact@v3
               with:
-                name: action_image_artifact_archway_${{ steps.lastrelease.outputs.tag }}
+                name: action_image_artifact_archway_v4.0.2
 
-            - name: Load ${{ steps.lastrelease.outputs.tag }} image
-              run: docker load --input archway_${{ steps.lastrelease.outputs.tag }}
+            - name: Load v4.0.2 image
+              run: docker load --input archway_v4.0.2
 
             - name: Run chain upgrade test
               run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,11 +28,17 @@ Contains bug fixes.
 Contains all the PRs that improved the code without changing the behaviours.
 -->
 
+## [v5.0.2](https://github.com/archway-network/archway/releases/tag/v5.0.2)
+
+### Changed
+
+- [#499](https://github.com/archway-network/archway/pull/499) - Rename the `v5.0.0` upgrade handler to `v5.0.2`
+
 ## [v5.0.1](https://github.com/archway-network/archway/releases/tag/v5.0.1)
 
 ### Fixed 
 
-- [#497](https://github.com/archway-network/archway/pull/497) - Fix rest endpoints in App. Cherrypicked [#496](https://github.com/archway-network/archway/pull/496) - Fix rest endpoints in App
+- [#497](https://github.com/archway-network/archway/pull/497) - Fix rest endpoints in App. Cherrypicked [#496](https://github.com/archway-network/archway/pull/496) 
 
 ## [v5.0.0](https://github.com/archway-network/archway/releases/tag/v5.0.0)
 

diff --git a/app/app_upgrades.go b/app/app_upgrades.go
@@ -12,7 +12,7 @@ import (
 	upgrade3_0_0 "github.com/archway-network/archway/app/upgrades/3_0_0"
 	upgrade4_0_0 "github.com/archway-network/archway/app/upgrades/4_0_0"
 	upgrade4_0_2 "github.com/archway-network/archway/app/upgrades/4_0_2"
-	upgrade5_0_0 "github.com/archway-network/archway/app/upgrades/5_0_0"
+	upgrade5_0_2 "github.com/archway-network/archway/app/upgrades/5_0_2"
 )
 
 // UPGRADES
@@ -24,7 +24,7 @@ var Upgrades = []upgrades.Upgrade{
 	upgrade3_0_0.Upgrade,      // v3.0.0
 	upgrade4_0_0.Upgrade,      // v4.0.0
 	upgrade4_0_2.Upgrade,      // v4.0.2
-	upgrade5_0_0.Upgrade,      // v5.0.0
+	upgrade5_0_2.Upgrade,      // v5.0.2
 }
 
 func (app *ArchwayApp) setupUpgrades() {

diff --git a/app/upgrades/5_0_0/upgrades.go → app/upgrades/5_0_2/upgrades.go b/app/upgrades/5_0_0/upgrades.go → app/upgrades/5_0_2/upgrades.go
@@ -1,4 +1,4 @@
-package upgrade5_0_0
+package upgrade5_0_2
 
 import (
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
@@ -32,13 +32,13 @@ import (
 
 // This upgrade handler is used for all the current changes to the protocol
 
-const Name = "v5.0.0"
+const Name = "v5.0.2"
 
 const NameAsciiArt = `                          
              ###     ###     ### 
-     # #     #       # #     # #    
-     # #     ###     # #     # #   
-      #        #     # #     # # 
+     # #     #       # #       #    
+     # #     ###     # #     ###   
+      #        #     # #     #  
              ###  #  ###  #  ### 
 
 `

diff --git a/interchaintest/setup.go b/interchaintest/setup.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	initialVersion = "v4.0.2" // The last release of the chain. The one the mainnet is running on
-	upgradeName    = "v5.0.0" // The next upgrade name. Should match the upgrade handler.
+	upgradeName    = "v5.0.2" // The next upgrade name. Should match the upgrade handler.
 	chainName      = "archway"
 )