From 5e0433187dd9457e8f5180c3373e1a51aedb23ce Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 26 Apr 2025 14:59:18 +0200 Subject: [PATCH 1/3] [Build] Unify Maven arguments in shared GH workflows Use long option names to be more readable. --- .github/workflows/codeQLworkflow.yml | 3 +-- .github/workflows/mavenBuild.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeQLworkflow.yml b/.github/workflows/codeQLworkflow.yml index b6b8c762833..d0733b366ed 100644 --- a/.github/workflows/codeQLworkflow.yml +++ b/.github/workflows/codeQLworkflow.yml @@ -93,9 +93,8 @@ jobs: uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a with: run: >- - mvn --batch-mode -V -U + 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 diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml index cca00fb3140..c69ff7f461c 100644 --- a/.github/workflows/mavenBuild.yml +++ b/.github/workflows/mavenBuild.yml @@ -91,9 +91,8 @@ jobs: uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a with: run: >- - mvn --batch-mode -V -U -e + 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 From 43aa70310cf65ea95faf359745d289de62e6b07b Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 26 Apr 2025 12:21:06 +0200 Subject: [PATCH 2/3] [Build] Replace use of coactions/setup-xvfb in shared GH workflows --- .github/workflows/codeQLworkflow.yml | 5 ++--- .github/workflows/mavenBuild.yml | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeQLworkflow.yml b/.github/workflows/codeQLworkflow.yml index d0733b366ed..271a1272863 100644 --- a/.github/workflows/codeQLworkflow.yml +++ b/.github/workflows/codeQLworkflow.yml @@ -90,9 +90,8 @@ jobs: tycho-version: 4.0.12 - name: Build with Maven - uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a - with: - run: >- + 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' || '' }} -Dcompare-version-with-baselines.skip=true diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml index c69ff7f461c..ec66b966dba 100644 --- a/.github/workflows/mavenBuild.yml +++ b/.github/workflows/mavenBuild.yml @@ -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 @@ -88,9 +92,8 @@ jobs: target: .github/matcher - run: echo "::add-matcher::.github/matcher/${{ steps.api-tools-matcher.outputs.filename }}" - name: Build with Maven - uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a - with: - run: >- + 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' || '' }} -Dcompare-version-with-baselines.skip=false From a69aea5b3cce4d396a7f884c6854a4f1d8ce6ddc Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 27 Apr 2025 10:19:00 +0200 Subject: [PATCH 3/3] [Build] Simplify download of API Tools matcher in shared GH workflow Makes it more compact and only relays on tools provided by the runner. --- .github/workflows/mavenBuild.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml index ec66b966dba..336a7559d14 100644 --- a/.github/workflows/mavenBuild.yml +++ b/.github/workflows/mavenBuild.yml @@ -85,12 +85,10 @@ 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 run: >- ${{ runner.os == 'Linux' && 'xvfb-run' || '' }}