Skip to content

Commit

Permalink
[Build] Remove coactions/setup-xvfb use
Browse files Browse the repository at this point in the history
It will stop working on Oct 15 and is claimed to not be needed anymore.
  • Loading branch information
akurtakov authored and HannesWell committed Sep 25, 2024
1 parent ef8e043 commit 4a4d2c9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
10 changes: 4 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down

0 comments on commit 4a4d2c9

Please sign in to comment.