aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL. E. Segovia <amy@amyspark.me>2022-10-29 21:24:13 +0000
committerEli Schwartz <eschwartz93@gmail.com>2022-10-30 01:03:31 -0400
commit0ddca4d0d0513e9ce1721902393019d4a3903bda (patch)
treeaa1edec136a5c9313a5b78e70c19b987728ff857
parent212af2b278f6cd58b17cabbff4883b5258601a6c (diff)
downloadmeson-0ddca4d0d0513e9ce1721902393019d4a3903bda.zip
meson-0ddca4d0d0513e9ce1721902393019d4a3903bda.tar.gz
meson-0ddca4d0d0513e9ce1721902393019d4a3903bda.tar.bz2
ci: Fix usage of concurrency in branches other than master
-rw-r--r--.github/workflows/cygwin.yml2
-rw-r--r--.github/workflows/file_format.yml2
-rw-r--r--.github/workflows/images.yml2
-rw-r--r--.github/workflows/lint.yml2
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--.github/workflows/msys2.yml2
-rw-r--r--.github/workflows/nonative.yml2
-rw-r--r--.github/workflows/os_comp.yml2
-rw-r--r--.github/workflows/unusedargs_missingreturn.yml2
9 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 173068a..3ca41d0 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -1,7 +1,7 @@
name: cygwin
concurrency:
- group: cygwin-${{ github.head_ref }}
+ group: cygwin-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/file_format.yml b/.github/workflows/file_format.yml
index ea55f2b..348b8ab 100644
--- a/.github/workflows/file_format.yml
+++ b/.github/workflows/file_format.yml
@@ -3,7 +3,7 @@ name: File format check
on: [push, pull_request]
concurrency:
- group: file_fmt-${{ github.head_ref }}
+ group: file_fmt-${{ github.head_ref || github.ref }}
cancel-in-progress: true
permissions:
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index b7e9de3..b220104 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -1,7 +1,7 @@
name: CI image builder
concurrency:
- group: img_builder-${{ github.head_ref }}
+ group: img_builder-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 90b4b97..da13924 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
name: Lint
concurrency:
- group: lint-${{ github.head_ref }}
+ group: lint-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b6aa843..da77578 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -1,7 +1,7 @@
name: macos
concurrency:
- group: macos-${{ github.head_ref }}
+ group: macos-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 32434d0..7e981f6 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -1,7 +1,7 @@
name: msys2
concurrency:
- group: msys2-${{ github.head_ref }}
+ group: msys2-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/nonative.yml b/.github/workflows/nonative.yml
index 32754f8..1687d5b 100644
--- a/.github/workflows/nonative.yml
+++ b/.github/workflows/nonative.yml
@@ -1,7 +1,7 @@
name: Cross-only compilation environment
concurrency:
- group: nonative-${{ github.head_ref }}
+ group: nonative-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index f38c81a..2d2e9b7 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -1,7 +1,7 @@
name: linux
concurrency:
- group: linux-${{ github.head_ref }}
+ group: linux-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on:
diff --git a/.github/workflows/unusedargs_missingreturn.yml b/.github/workflows/unusedargs_missingreturn.yml
index 8118fb2..935d7ee 100644
--- a/.github/workflows/unusedargs_missingreturn.yml
+++ b/.github/workflows/unusedargs_missingreturn.yml
@@ -10,7 +10,7 @@ env:
FFLAGS: "-fimplicit-none"
concurrency:
- group: unusedargs-${{ github.head_ref }}
+ group: unusedargs-${{ github.head_ref || github.ref }}
cancel-in-progress: true
on: