Merge ad6d09a into 3.8.0-M1

Signed-off-by: Violeta Georgieva <[email protected]>
reactor · Feb 11, 2025 · ba86b9e · ba86b9e
2 parents 4272510 + ad6d09a
commit ba86b9e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0 #needed by spotless
       - name: Setup JDK 11
-        if: contains('main', github.base_ref)
+        if: contains('main 3.7.x', github.base_ref)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'
@@ -69,7 +69,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4
     - name: Setup JDK 11
-      if: contains('main', github.base_ref)
+      if: contains('main 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'

diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml
@@ -37,7 +37,7 @@ jobs:
           java-version: 9.0.4
           jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
       - name: Setup Java 11
-        if: contains('main', matrix.branch)
+        if: contains('main 3.7.x', matrix.branch)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4
     - name: Setup JDK 11
-      if: contains('main', github.base_ref)
+      if: contains('main 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -102,7 +102,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4
     - name: Setup JDK 11
-      if: contains('main', github.base_ref)
+      if: contains('main 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -140,7 +140,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4
     - name: Setup JDK 11
-      if: contains('main', github.base_ref)
+      if: contains('main 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'
@@ -180,7 +180,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4
     - name: Setup JDK 11
-      if: contains('main', github.base_ref)
+      if: contains('main 3.7.x', github.base_ref)
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
       with:
         distribution: 'temurin'

diff --git a/.github/workflows/snapshots.yml b/.github/workflows/snapshots.yml
@@ -35,7 +35,7 @@ jobs:
           java-version: 9.0.4
           jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
       - name: Setup Java 11
-        if: contains('main', matrix.branch)
+        if: contains('main 3.7.x', matrix.branch)
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # tag=v3
         with:
           distribution: 'temurin'