[Build] Improve elements order in maven.yml and build with Maven 3.9.9

eclipse-equinox · Sep 26, 2024 · 3c5ada4 · 3c5ada4
1 parent ef8e043
commit 3c5ada4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,15 +11,15 @@ on:
 
 jobs:
   build:
-    name: Build ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.runner-os }}
     strategy:
       fail-fast: false
       matrix:
         config: 
           - { name: Linux, runner-os: ubuntu-latest, ws: gtk, os: linux, native-extension: so }
           - { name: Windows, runner-os: windows-2019, ws: win32, os: win32, native-extension: dll }
           - { name: MacOS, runner-os: macos-13, ws: cocoa, os: macosx, native-extension: so }
+    name: Build ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.runner-os }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -45,13 +45,13 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.6
+        maven-version: 3.9.9
     - name: Install GTK requirements
       if: ${{ matrix.config.ws == 'gtk'}}
       run: |
         sudo apt-get update -q -y 
         sudo apt-get install -q -y libgtk-3-dev 
-    - name: Build with Maven
+    - name: Build
       uses: coactions/setup-xvfb@v1
       env:
         EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
@@ -101,7 +101,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.6
+        maven-version: 3.9.9
     - name: Run OSGi TCKs
       run: >- 
         mvn

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -33,6 +33,7 @@ jobs:
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
         fetch-depth: 0 # required for jgit timestamp provider to work
+        path: equinox
     - name: checkout equinox.binaries
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       with:
@@ -58,17 +59,16 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
-        maven-version: 3.9.6
-    - name: Build with Maven
+        maven-version: 3.9.9
+    - name: Build
       uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
       with:
+       working-directory: equinox
        run: >- 
         mvn
         --batch-mode
         -Pbree-libs
         -Papi-check
-        -Dcompare-version-with-baselines.skip=false
-        -Dmaven.test.failure.ignore=true
         -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries
         -DskipTests=true
         clean verify