Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build] Replace use of coactions/setup-xvfb #677

Merged
merged 2 commits into from
Sep 26, 2024
Merged

[Build] Replace use of coactions/setup-xvfb #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac5462
[Build] Improve elements order in maven.yml and build with Maven 3.9.9
HannesWell Sep 26, 2024
5a9f04c
[Build] Remove coactions/setup-xvfb use
akurtakov Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ 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 }}
defaults:
run: # Run on cmd on Windows because powershell interprets dots in arguments differently
shell: ${{ matrix.config.os == 'win32' && 'cmd' || 'bash' }}
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -45,19 +48,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: 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 Expand Up @@ -101,7 +102,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
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/codeql.yml
View file
Open in desktop
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: 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
Loading