From abde0eb3e1bc4800582e4d9ee18e88c0f3890a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 25 Sep 2024 18:55:24 +0300 Subject: [PATCH] [Build] Remove coactions/setup-xvfb use It will stop working on Oct 15 and is claimed to not be needed anymore. Co-authored-by: Hannes Wellmann --- .github/workflows/build.yml | 9 +++++---- .github/workflows/codeql.yml | 6 ++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e90001cb27..edc492898b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,9 @@ jobs: - { 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: @@ -52,12 +55,10 @@ jobs: sudo apt-get update -q -y sudo apt-get install -q -y libgtk-3-dev - name: Build - uses: coactions/setup-xvfb@v1 env: EQUINOX_BINARIES_LOC: ${{ github.workspace }}/equinox.binaries - with: - working-directory: equinox - run: >- + working-directory: equinox + run: >- mvn --batch-mode -Pbree-libs diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index deedbc4ce7..5e11f57229 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -61,10 +61,8 @@ jobs: with: maven-version: 3.9.9 - name: Build - uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a - with: - working-directory: equinox - run: >- + working-directory: equinox + run: >- mvn --batch-mode -Pbree-libs