Skip to content

[Build|GH] Unify Maven arguments and replace use of coactions/setup-xvfb #2998

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

Merged
merged 3 commits into from
Apr 27, 2025
Merged

[Build|GH] Unify Maven arguments and replace use of coactions/setup-xvfb #2998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e04331
[Build] Unify Maven arguments in shared GH workflows
HannesWell Apr 26, 2025
43aa703
[Build] Replace use of coactions/setup-xvfb in shared GH workflows
HannesWell Apr 26, 2025
a69aea5
[Build] Simplify download of API Tools matcher in shared GH workflow
HannesWell Apr 27, 2025
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
8 changes: 3 additions & 5 deletions .github/workflows/codeQLworkflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,10 @@ jobs:
tycho-version: 4.0.12

- name: Build with Maven
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: >-
mvn --batch-mode -V -U
run: >-
${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
mvn --batch-mode --no-transfer-progress --show-version --update-snapshots --errors
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
-ntp
-Dcompare-version-with-baselines.skip=true
-Pbree-libs
-DskipTests=true
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/mavenBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ jobs:
- { name: Linux, os: ubuntu-latest }
- { name: Windows, os: windows-latest }
- { name: MacOS, os: macos-13 }
defaults:
run: # Run always on bash, because powershell (the Windows default) interprets dots in arguments differently
shell: bash

name: Verify ${{ matrix.config.name }}
steps:
- name: Checkout
Expand Down Expand Up @@ -81,19 +85,15 @@ jobs:
tycho-version: 4.0.12

- name: Download the API Tools matcher
uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
id: api-tools-matcher
with:
url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json"
target: .github/matcher
- run: echo "::add-matcher::.github/matcher/${{ steps.api-tools-matcher.outputs.filename }}"
run: |
mkdir .github/matcher
curl -o .github/matcher/api-tools.json https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json
echo "::add-matcher::.github/matcher/api-tools.json"
- name: Build with Maven
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: >-
mvn --batch-mode -V -U -e
run: >-
${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
mvn --batch-mode --no-transfer-progress --show-version --update-snapshots --errors
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
-ntp
-Dcompare-version-with-baselines.skip=false
-Pbree-libs
-Papi-check
Expand Down
Loading