From a4168690e6b927069bedce4498cae9ef4fd4ba13 Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 22 Apr 2024 12:06:40 -0400 Subject: [PATCH] try to fix supported versions Signed-off-by: Alexandre Lamarre --- .github/workflows/ci.yaml | 4 ---- .github/workflows/scripts/supported-versions.sh | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06686312..2526e5d7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,8 +2,6 @@ name: Backup Restore CI on: push: - branches: - - 'release/v5.0' paths-ignore: - 'docs/**' - '*.md' @@ -11,8 +9,6 @@ on: - '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 index 48ff26b5..416c2284 100755 --- 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