try to fix supported versions

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>
rancher · Apr 22, 2024 · a416869 · a416869
1 parent 8070c63
commit a416869
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -2,17 +2,13 @@ name: Backup Restore CI
 
 on:
   push:
-    branches:
-      - 'release/v5.0'
     paths-ignore:
       - 'docs/**'
       - '*.md'
       - '.gitignore'
       - 'CODEOWNERS'
       - 'LICENSE'
   pull_request:
-    branches:
-      - 'release/v5.0'
     paths-ignore:
     - 'docs/**'
     - '*.md'

diff --git a/.github/workflows/scripts/supported-versions.sh b/.github/workflows/scripts/supported-versions.sh
@@ -7,15 +7,15 @@ set -x
 # Prints supported versions based on the current release branch targeted
 # Version output is in JSON
 
-if git merge-base --is-ancestor release/v5.0 HEAD
+if git merge-base --is-ancestor origin/release/v5.0 HEAD
 then
   echo "[\"v1.23.9-k3s1\", \"v1.29.3-k3s1\"]"
   exit 0
-elif git merge-base --is-ancestor release/v4.0 HEAD
+elif git merge-base --is-ancestor origin/release/v4.0 HEAD
 then
   echo "[\"v1.23.9-k3s1\", \"v1.28.8-k3s1\"]"
   exit 0
-elif git merge-base --is-ancestor release/v3.0 HEAD
+elif git merge-base --is-ancestor origin/release/v3.0 HEAD
 then
   echo "[\"v1.16.9-k3s1\", \"v1.27.9-k3s1\"]"
   exit 0