From 6749ec03193b8360d2e10814390a7ded0538d0fe Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 24 Nov 2024 19:40:55 -0500 Subject: [PATCH 1/5] Update libwebkit build dep --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 40a0fa3..6053042 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -26,7 +26,7 @@ jobs: - name: Install Linux dependencies if: matrix.os == 'ubuntu-latest' - run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev + run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.1-dev - name: Set up Node.js uses: actions/setup-node@v4.0.2 From d4dc4550b7b652626976ba9a6bb17ac949b3d341 Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 24 Nov 2024 19:41:35 -0500 Subject: [PATCH 2/5] Build alternate Linux binary --- .github/workflows/build-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 6053042..286499b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -62,7 +62,12 @@ jobs: - name: Create release directory run: mkdir -p release + - name: Build Wails app (Linux) + if: matrix.os == 'ubuntu-latest' + run: wails build && wails build -tags webkit2_41 -o ${{ steps.filename.outputs.prop }}-linux-alt + - name: Build Wails app + if: matrix.os != 'ubuntu-latest' run: wails build - name: Zip release file From 64d2b1a21659f7607526e5bc1d091cbfbbfa15b2 Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 24 Nov 2024 19:50:18 -0500 Subject: [PATCH 3/5] Downgrade libwebkit2gtk dep --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 286499b..19c2bd0 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -26,7 +26,7 @@ jobs: - name: Install Linux dependencies if: matrix.os == 'ubuntu-latest' - run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.1-dev + run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev - name: Set up Node.js uses: actions/setup-node@v4.0.2 From 2573113ac53b5bab1233d02db7ad78b9e080fdfd Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 24 Nov 2024 19:52:11 -0500 Subject: [PATCH 4/5] Split alt Linux build to separate step --- .github/workflows/build-release.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 19c2bd0..4a14e39 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -62,13 +62,12 @@ jobs: - name: Create release directory run: mkdir -p release - - name: Build Wails app (Linux) - if: matrix.os == 'ubuntu-latest' - run: wails build && wails build -tags webkit2_41 -o ${{ steps.filename.outputs.prop }}-linux-alt - - name: Build Wails app - if: matrix.os != 'ubuntu-latest' run: wails build + + - name: Build Wails app (Linux-alt) + if: matrix.os == 'ubuntu-latest' + run: wails build -tags webkit2_41 -o ${{ steps.filename.outputs.prop }}-linux-alt - name: Zip release file uses: vimtor/action-zip@v1 From 141cefee0d2c08359e264a4d2f119f15f952c9c3 Mon Sep 17 00:00:00 2001 From: Sammy-T Date: Sun, 24 Nov 2024 19:58:27 -0500 Subject: [PATCH 5/5] Install both libwebkit deps for build --- .github/workflows/build-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 4a14e39..c0d1770 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -26,7 +26,7 @@ jobs: - name: Install Linux dependencies if: matrix.os == 'ubuntu-latest' - run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev + run: sudo apt-get update && sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev - name: Set up Node.js uses: actions/setup-node@v4.0.2