Merge branch 'master' into polkadot-v0.9.38

humanode-network · Mar 29, 2023 · a6322b8 · a6322b8
2 parents 20d493e + 90c6853
commit a6322b8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ env:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' }}
 
 jobs:
 

diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -2,12 +2,16 @@ name: code
 
 on:
   push:
+    branches:
+      - '**'
+      - '!gh-readonly-queue/**'
+  merge_group:
   schedule:
     - cron: '0 20 * * 0'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' }}
 
 defaults:
   run:

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,12 +4,14 @@ on:
   push:
     branches:
       - '**'
+      - '!gh-readonly-queue/**'
     tags:
       - 'v*.*.*'
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' }}
 
 jobs:
 

diff --git a/.github/workflows/toml.yml b/.github/workflows/toml.yml
@@ -2,12 +2,16 @@ name: toml
 
 on:
   push:
+    branches:
+      - '**'
+      - '!gh-readonly-queue/**'
+  merge_group:
   schedule:
     - cron: '0 20 * * 0'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' && github.event_name != 'merge_group' }}
 
 jobs: