From 28a9cf15129db58dbeab50e8d419e4d87aefdeda Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 2 Dec 2024 20:11:41 -0800
Subject: [PATCH 1/3] Update CI

---
 .github/workflows/main.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7c380eb3ac..127d123df2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,18 +21,14 @@ permissions:
 
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: 'ubuntu-22.04'
     strategy:
       fail-fast: false
       matrix:
         java_version: ['8', '11', '17', '21', '22']
-        os: ['ubuntu-22.04']
         include:
           - java_version: '8'
-            os: 'ubuntu-22.04'
             release_build: 'R'
-          - java_version: '8'
-            os: 'windows-latest'
             is_windows: 'W'
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
@@ -55,7 +51,7 @@ jobs:
     - name: Extract project Maven version
       id: projectVersion
       if: ${{ !matrix.is_windows }}
-      run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.4.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
+      run: echo "version=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.5.1:evaluate -DforceStdout -Dexpression=project.version -q)" >> $GITHUB_OUTPUT
     - name: Verify Android SDK Compatibility
       if: ${{ matrix.release_build }}
       run: ./mvnw -B -q -ff -ntp -DskipTests animal-sniffer:check

From c3a00eaedaccb65f569502ce2e9b0f44f76bcbb1 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 2 Dec 2024 20:17:57 -0800
Subject: [PATCH 2/3] Try to fix CI

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 127d123df2..5f0dd12c15 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -56,7 +56,7 @@ jobs:
       if: ${{ matrix.release_build }}
       run: ./mvnw -B -q -ff -ntp -DskipTests animal-sniffer:check
     - name: Deploy snapshot
-      if: ${{ github.event_name != 'pull_request' && matrix.release_build && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
+      if: ${{ matrix.release_build && github.event_name != 'pull_request' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
       env:
         CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

From 30a0e4d819a267c7e0031fdbf5139adcd95aa05e Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 2 Dec 2024 20:27:36 -0800
Subject: [PATCH 3/3] Fix CI (dropped Windows accidentally)

---
 .github/workflows/main.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5f0dd12c15..88d07714b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,14 +21,19 @@ permissions:
 
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    # Here we DO need "os" option, to include Windows
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         java_version: ['8', '11', '17', '21', '22']
+        os: ['ubuntu-22.04']
         include:
           - java_version: '8'
+            os: 'ubuntu-22.04'
             release_build: 'R'
+          - java_version: '8'
+            os: 'windows-latest'
             is_windows: 'W'
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"