From 2d0e0424a1e7b5c544427e9923a1efdc15be152d Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 21 Nov 2023 14:30:49 +0000
Subject: [PATCH] Use single github workflow to do CI on multiple OSs by
 SingingBush

---
 .github/workflows/maven-windows.yml | 30 -----------------------------
 .github/workflows/maven.yml         | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 35 deletions(-)
 delete mode 100644 .github/workflows/maven-windows.yml

diff --git a/.github/workflows/maven-windows.yml b/.github/workflows/maven-windows.yml
deleted file mode 100644
index 9f8f4b5c1..000000000
--- a/.github/workflows/maven-windows.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
-
-name: Java CI with Maven on Windows
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: mvn -B package checkstyle:check findbugs:check --file pom.xml
-
-    # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    #- name: Update dependency graph
-    #  uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c627bdb83..661a55573 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -11,15 +11,20 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    name: Test with Java ${{ matrix.jdk }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        jdk: ['8']
+        os: [ubuntu-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 8
+    - uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.jdk }}
       uses: actions/setup-java@v3
       with:
-        java-version: '8'
+        java-version: ${{ matrix.jdk }}
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-- 
2.39.5