Skip to content

Commit 6c2ae28

Browse files
committed
[Build] Replace use of coactions/setup-xvfb in shared GH workflows
1 parent b92cf9d commit 6c2ae28

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/codeQLworkflow.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ jobs:
9090
tycho-version: 4.0.12
9191

9292
- name: Build with Maven
93-
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
94-
with:
95-
run: >-
93+
run: >-
94+
${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
9695
mvn --batch-mode --no-transfer-progress --show-version --update-snapshots --errors
9796
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
9897
-Dcompare-version-with-baselines.skip=true

.github/workflows/mavenBuild.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ jobs:
4747
- { name: Linux, os: ubuntu-latest }
4848
- { name: Windows, os: windows-latest }
4949
- { name: MacOS, os: macos-13 }
50+
defaults:
51+
run: # Run always on bash, because powershell (the Windows default) interprets dots in arguments differently
52+
shell: bash
53+
5054
name: Verify ${{ matrix.config.name }}
5155
steps:
5256
- name: Checkout
@@ -88,9 +92,8 @@ jobs:
8892
target: .github/matcher
8993
- run: echo "::add-matcher::.github/matcher/${{ steps.api-tools-matcher.outputs.filename }}"
9094
- name: Build with Maven
91-
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
92-
with:
93-
run: >-
95+
run: >-
96+
${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
9497
mvn --batch-mode --no-transfer-progress --show-version --update-snapshots --errors
9598
${{ inputs.without-EF-infra && '-Dtycho.version=4.0.12' || '' }}
9699
-Dcompare-version-with-baselines.skip=false

0 commit comments

Comments
 (0)