From 4a4d2c9b2c8df81330a7c92bcf4919fad3d5c29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?=
 =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?=
 <akurtakov@gmail.com>
Date: Wed, 25 Sep 2024 18:55:24 +0300
Subject: [PATCH] [Build] Remove coactions/setup-xvfb use

It will stop working on Oct 15 and is claimed to not be needed anymore.
---
 .github/workflows/build.yml  | 10 ++++------
 .github/workflows/codeql.yml | 12 +++++-------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62f4a696e46..17f0c669d69 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,19 +45,17 @@ 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
-      uses: coactions/setup-xvfb@v1
+    - name: Maven build
       env:
         EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
-      with:
-       working-directory: equinox
-       run: >- 
+      working-directory: equinox
+      run: >- 
         mvn
         --batch-mode
         -Pbree-libs
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 786044e9b32..a7b1558e157 100644
--- 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,14 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
-        maven-version: 3.9.6
-    - name: Build with Maven
-      uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
-      with:
-       run: >- 
+        maven-version: 3.9.9
+    - name: Maven build
+      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