[xenomai-images][PATCH] ci: Update kernel version filters in trigger jobs

Jan Kiszka <[email protected]>
Newsgroups dev.linux.lists.xenomai
Message-ID <[email protected]>
From: Jan Kiszka <[email protected]>

First, v6.18 is now an LTS and needs to trigger its dedicated pipeline.
And second, already account for upcoming 7.0 - up to 9.19.

Signed-off-by: Jan Kiszka <[email protected]>
---
 ci/trigger/dovetail.yml | 8 ++++----
 ci/trigger/evl.yml      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/trigger/dovetail.yml b/ci/trigger/dovetail.yml
index b904c1a..60fa2ce 100644
--- a/ci/trigger/dovetail.yml
+++ b/ci/trigger/dovetail.yml
@@ -14,8 +14,8 @@
 
 workflow:
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^v(5\.(10|15)|6\.(1|12))(\.y)?(-cip)?-dovetail-rebase$/'
-    - if: '$CI_COMMIT_BRANCH =~ /^v6\.[0-9]+\.y(-cip)?-dovetail-rebase$/'
+    - if: '$CI_COMMIT_BRANCH =~ /^v(5\.(10|15)|6\.(1|12|18))(\.y)?(-cip)?-dovetail-rebase$/'
+    - if: '$CI_COMMIT_BRANCH =~ /^v[6-9]\.[0-9]+\.y(-cip)?-dovetail-rebase$/'
 
 stages:
   - set_vars
@@ -31,12 +31,12 @@ set-vars:
       apt update -y && apt install git -y
 
       KERNEL_VERSION=""
-      if [[ "$CI_COMMIT_BRANCH" =~ ^v(5\.(10|15)|6\.(1|12))(\.y)?(-cip)?-dovetail-rebase$ ]]; then
+      if [[ "$CI_COMMIT_BRANCH" =~ ^v(5\.(10|15)|6\.(1|12|18))(\.y)?(-cip)?-dovetail-rebase$ ]]; then
           KERNEL_VERSION=$(echo "$CI_COMMIT_BRANCH" | sed -nE 's/^v([0-9]+\.[0-9]+)(\.y)?(-cip)?-dovetail-rebase$/\1/p')
       elif [ "$CI_COMMIT_BRANCH" = \
         "$(git ls-remote --tags --head --refs https://gitlab.com/xenomai/linux-dovetail.git | \
         sed -e "s/.*[[:space:]]refs\/\(tags\|heads\)\///" | \
-        grep -E "^v6\.[0-9]+\.y(-cip)?-dovetail-rebase$" | \
+        grep -E "^v[6-9]\.[0-9]+\.y(-cip)?-dovetail-rebase$" | \
         sort -r -V | head -1)" ]; then
           KERNEL_VERSION="head"
       fi
diff --git a/ci/trigger/evl.yml b/ci/trigger/evl.yml
index fe87bcb..a02873b 100644
--- a/ci/trigger/evl.yml
+++ b/ci/trigger/evl.yml
@@ -14,8 +14,8 @@
 
 workflow:
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^v(5\.(10|15)|6\.(1|12))(\.y)?(-cip)?-evl-rebase$/'
-    - if: '$CI_COMMIT_BRANCH =~ /^v6\.[0-9]+\.y(-cip)?-evl-rebase$/'
+    - if: '$CI_COMMIT_BRANCH =~ /^v(5\.(10|15)|6\.(1|12|18))(\.y)?(-cip)?-evl-rebase$/'
+    - if: '$CI_COMMIT_BRANCH =~ /^v[6-9]\.[0-9]+\.y(-cip)?-evl-rebase$/'
 
 stages:
   - set_vars
@@ -31,12 +31,12 @@ set-vars:
       apt update -y && apt install git -y
 
       KERNEL_VERSION=""
-      if [[ "$CI_COMMIT_BRANCH" =~ ^v(6\.(1|12))(\.y)?(-cip)?-evl-rebase$ ]]; then
+      if [[ "$CI_COMMIT_BRANCH" =~ ^v(6\.(1|12|18))(\.y)?(-cip)?-evl-rebase$ ]]; then
           KERNEL_VERSION=$(echo "$CI_COMMIT_BRANCH" | sed -nE 's/^v([0-9]+\.[0-9]+)(\.y)?(-cip)?-evl-rebase$/\1/p')
       elif [ "$CI_COMMIT_BRANCH" = \
         "$(git ls-remote --tags --head --refs https://gitlab.com/Xenomai/xenomai4/linux-evl.git | \
         sed -e "s/.*[[:space:]]refs\/\(tags\|heads\)\///" | \
-        grep "v6\.[0-9].*-evl-rebase" | \
+        grep "v[6-9]\.[0-9].*-evl-rebase" | \
         sort -r -n -k 1.4 | head -1)" ]; then
           KERNEL_VERSION="head"
       fi
-- 
2.47.3
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.