Skip to content

Commit

Permalink
Remove setub-xvfb gha
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
in.
  • Loading branch information
akurtakov committed Sep 25, 2024
1 parent ef8e043 commit 56c2d1d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 31 deletions.
24 changes: 7 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,21 @@ jobs:
JavaSE-17
distribution: 'temurin'
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6
- 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: Set up Maven
uses: stCarolas/setup-maven@v5
env:
EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries
with:
working-directory: equinox
run: >-
mvn
--batch-mode
-Pbree-libs
-Papi-check
-Dcompare-version-with-baselines.skip=false
-Dmaven.test.failure.ignore=true
-Dnative=${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64
-Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries
clean verify
maven-version: 3.9.9
- name: Maven build
with:
working-directory: equinox
run: mvn -B -Pbree-libs -Papi-check -Dcompare-version-with-baselines.skip=false -Dmaven.test.failure.ignore=true -Dnative=${{ matrix.config.ws }}.${{ matrix.config.os }}.x86_64 -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries clean verify
- name: Upload native artifacts
uses: actions/upload-artifact@v4
if: success()
Expand Down
18 changes: 4 additions & 14 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,11 @@ 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
maven-version: 3.9.9
- name: Maven build
with:
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
working-directory: equinox
run: mvn --batch-mode -Pbree-libs -Papi-check -Dequinox.binaries.loc=${{ github.workspace }}/equinox.binaries -DskipTests=true clean verify
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
Expand Down

0 comments on commit 56c2d1d

Please sign in to comment.