Merge branch 'main' into reece/v17-upgrade

CosmosContracts · Aug 7, 2023 · c036fde · c036fde
2 parents 54ff5f0 + 5cca8c5
commit c036fde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -8,8 +8,6 @@ on:
       - master
       - main
   pull_request:
-    paths:
-      - '**.go'
 
 permissions:
   contents: read

diff --git a/.github/workflows/interchaintest-E2E.yml b/.github/workflows/interchaintest-E2E.yml
@@ -1,16 +1,17 @@
 name: ictest E2E
 
 on:
+  pull_request:
   push:
     tags:
       - '**'
     branches:
-      - '**'
-    paths:
-      - '**.yml'
-      - '**.go'
-      - '**.mod'
-      - '**.sum'
+      - 'main'
+      - 'master'
+
+permissions:
+  contents: read
+  packages: write
 
 env:
   REGISTRY: ghcr.io  

diff --git a/app/app.go b/app/app.go
@@ -617,8 +617,9 @@ func (app *App) setupUpgradeStoreLoaders() {
 
 	for _, upgrade := range Upgrades {
 		if upgradeInfo.Name == upgrade.UpgradeName {
+			storeUpgrades := upgrade.StoreUpgrades
 			app.SetStoreLoader(
-				upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &upgrade.StoreUpgrades),
+				upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades),
 			)
 		}
 	}