Skip to content

Commit 2ba2e75

Browse files
authored
Revert back to Ubuntu-only GH Action (#677)
1 parent b00c26c commit 2ba2e75

1 file changed

Lines changed: 23 additions & 20 deletions

File tree

.github/workflows/build.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ on:
99

1010
jobs:
1111
release:
12-
strategy:
13-
matrix:
14-
os: [windows-2025, ubuntu-24.04]
15-
runs-on: ${{ matrix.os }}
12+
runs-on: ubuntu-24.04
1613
steps:
1714
- name: Checkout
1815
uses: actions/checkout@v4
@@ -26,29 +23,35 @@ jobs:
2623

2724
- name: Setup Gradle
2825
uses: gradle/actions/setup-gradle@v4
29-
30-
- name: Windows innosetup
31-
if: ${{ contains(matrix.os, 'windows') }}
26+
27+
- name: Setup Wine
3228
run: |
33-
Invoke-WebRequest -Uri http://files.jrsoftware.org/is/6/innosetup-6.2.2.exe -OutFile is.exe
34-
.\is.exe /VERYSILENT /SUPPRESSMSGBOXES
29+
sudo dpkg --add-architecture i386
30+
sudo apt update
31+
sudo apt install wine wine32 wine64
3532
36-
- name: Build
37-
run: |
38-
cd Quelea
39-
gradle -Dnightly=true -Dversionsuffix=CI-UNSTABLE clean labelcheck downloadJres jar copyToDist
33+
- name: Setup Inno Setup cache
34+
id: cache-innosetup
35+
uses: actions/cache@v4
36+
with:
37+
path: ~/.wine/drive_c/Program Files (x86)/Inno Setup 6
38+
key: ${{ runner.os }}-innosetup
4039

41-
- name: Create MacOS standalone and CP-installer
42-
if: ${{ !contains(matrix.os, 'windows') }}
40+
- name: Install InnoSetup
41+
if: ${{ ! steps.cache-innosetup.outputs.cache-hit }} # || true on Inno Setup update
42+
env:
43+
DISPLAY: :99
44+
WINEDEBUG: -all,err+all
45+
WINEARCH: win64
4346
run: |
44-
cd Quelea
45-
gradle -Dnightly=true -Dversionsuffix=CI-UNSTABLE runPackr izpack releaseSummary
47+
Xvfb $DISPLAY &
48+
curl -SL "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" -o is.exe
49+
wine is.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES
4650
47-
- name: Create Windows standalone
48-
if: ${{ contains(matrix.os, 'windows') }}
51+
- name: Build
4952
run: |
5053
cd Quelea
51-
gradle -Dnightly=true -Dversionsuffix=CI-UNSTABLE downloadGStreamer createQueleaExe64 innosetup releaseSummary
54+
gradle -Dnightly=true -Dversionsuffix=CI-UNSTABLE clean dist
5255
5356
- name: Upload binaries to release
5457
uses: softprops/action-gh-release@v2

0 commit comments

Comments
 (0)