CI: add exclude for checking base_ref

BBBmau · Nov 18, 2024 · f5db0b0 · f5db0b0
1 parent 6f706cb
commit f5db0b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/acceptance_tests_kind.yaml b/.github/workflows/acceptance_tests_kind.yaml
@@ -50,10 +50,10 @@ jobs:
           - v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
           - v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
           - v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
-        isMain:
-          - ${{ contains(github.ref, 'main') }}
+        isBaseMain:
+          - ${{ contains(github.base_ref, 'main') }}
         exclude:
-          - isMain: true
+          - isBaseMain: true
             kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
     steps:
       - name: Checkout repository

diff --git a/.github/workflows/manifest_acc.yaml b/.github/workflows/manifest_acc.yaml
@@ -40,10 +40,15 @@ jobs:
           - v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb
         isMain:
           - ${{ contains(github.ref, 'main') }}
+        isBaseMajorRelease:
+          - ${{ contains(github.base_ref, 'v3-major-release') }}
         exclude:
           - isMain: true
+            isBaseMajorRelease: false
+            kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
+          - isMain: false
+            isBaseMajorRelease: true
             kubernetes_version: v1.31.2@sha256:33034c0a75dd82b2f2f22bdf0a30ea2a42b2c3547a6d56c52c7ea9c1b5fb89b9
-
         terraform_version:
           - 1.9.8
           - 1.8.5