Skip to content

Commit c26db83

Browse files
authored
Fix OS matrix and update Ubuntu dependency installation
Updated the OS matrix in the build workflow and modified the dependency installation steps for Ubuntu.
1 parent cf6a4f3 commit c26db83

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fail-fast: false
1010
matrix:
1111
java: [ '11', '17', '21' ]
12-
os: [ windows-latest, ubuntu-20.04, macOS-latest ]
12+
os: [ windows-latest, ubuntu-latest, macOS-latest ]
1313
runs-on: ${{ matrix.os }}
1414
env:
1515
MAVEN_OPTS: -Dhttp.keepAlive=false
@@ -19,14 +19,18 @@ jobs:
1919
with:
2020
distribution: zulu
2121
java-version: ${{ matrix.java }}
22-
cache: 'maven'
2322
- if: contains(matrix.os, 'ubuntu')
2423
name: Install dependencies
2524
run: |
26-
sudo rm -vf /etc/apt/sources.list.d/microsoft-prod.list
27-
sudo apt-get update && sudo apt-get install -y --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
28-
sudo apt-get purge -y libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
29-
sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y wine32
25+
# sudo rm -vf /etc/apt/sources.list.d/microsoft-prod.list
26+
# sudo apt-get update && sudo apt-get install -y --allow-downgrades libgd3/focal libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
27+
# sudo apt-get purge -y libmono* moby* mono* php* libgdiplus libpcre2-posix3 libzip4
28+
# sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install -y wine32
29+
sudo mkdir -pm755 /etc/apt/keyrings
30+
sudo wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
31+
sudo wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/noble/winehq-noble.sources
32+
sudo apt-get update -y
33+
sudo apt-get install --install-recommends winehq-stable -y
3034
- uses: actions/cache@v3
3135
with:
3236
path: ~/.m2/repository

0 commit comments

Comments
 (0)