From 69a8c507e9bd49fcb0ed824b22811078d2cb812a Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Tue, 15 Oct 2024 15:14:14 +0800
Subject: [PATCH] Problem: no cancel-in-progress in ci flow (#1088)

* Problem: no cancel-in-progress in ci flow

* fix
---
 .github/workflows/audit.yml           | 17 +++++++++++------
 .github/workflows/build.yml           |  4 ++++
 .github/workflows/buildwin.yml        |  5 +++++
 .github/workflows/codecov.yml         |  4 ++++
 .github/workflows/codeql-analysis.yml |  4 ++++
 .github/workflows/gosec.yml           |  4 ++++
 .github/workflows/lint.yml            |  5 +++++
 .github/workflows/nix.yml             |  4 ++++
 integration_tests/test_upgrade.py     |  2 +-
 9 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index cbe1c4132..4ab67d7f6 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -1,12 +1,17 @@
 name: govuln
 
 on:
-    pull_request:
-    merge_group:
-    push:
-      branches:
-        - master
-        - release/**
+  pull_request:
+  merge_group:
+  push:
+    branches:
+      - master
+      - release/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check:
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dbad7b649..7c8532f44 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,10 @@ on:
   issue_comment:
     types: [created, edited]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   member:
     name: Check whether it is triggered by team members with issue_comment or push or pull_request
diff --git a/.github/workflows/buildwin.yml b/.github/workflows/buildwin.yml
index 14d8e967a..79f0d0bc6 100644
--- a/.github/workflows/buildwin.yml
+++ b/.github/workflows/buildwin.yml
@@ -7,6 +7,11 @@ on:
     branches:
       - master
       - release/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build For Windows
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index 063fb87e1..d1321c1c3 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -7,6 +7,10 @@ on:
       - master
       - release/**
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   codecov:
     name: codecov
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e5813ef47..aa2a93bda 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,6 +26,10 @@ on:
         - "**.go"
   merge_group:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml
index d3d0dcf60..199e2660e 100644
--- a/.github/workflows/gosec.yml
+++ b/.github/workflows/gosec.yml
@@ -7,6 +7,10 @@ on:
       - master
       - release/**
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   Gosec:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index ca8293b68..2d083dd59 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -6,6 +6,11 @@ on:
     branches:
       - master
       - release/**
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   golangci:
     name: golangci-lint
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 86b37625c..ec8247bc2 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -12,6 +12,10 @@ on:
 env:
   NIXPKGS_ALLOW_INSECURE: 1
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: ubuntu-latest
diff --git a/integration_tests/test_upgrade.py b/integration_tests/test_upgrade.py
index 32e309566..2937373f0 100644
--- a/integration_tests/test_upgrade.py
+++ b/integration_tests/test_upgrade.py
@@ -427,7 +427,7 @@ def assert_commission(adr, expected):
     for i in range(2):
         cluster.migrate_keystore(i=i)
     upgrade(cluster, "v4.3.0", target_height)
-
+    cli = cluster.cosmos_cli()
     target_height = cluster.block_height() + 15
     gov_param = cli.query_params("gov")
     upgrade(cluster, "v5.0", target_height, broadcast_mode="sync")