From 6aa0fa647a7f3fb9eef4d799e1a982a88952c4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Lars=C3=A9n?= Date: Sun, 30 Nov 2025 20:36:30 +0100 Subject: [PATCH 1/5] Add Ubuntu 22.04 builds --- .github/workflows/publish.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index b6cb8e06be..70c57ae19c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -100,6 +100,10 @@ jobs: target: '' - platform: ubuntu-24.04-arm # [linux, ARM64] target: '' + - platform: ubuntu-22.04 # [linux, x64] + target: '' + - platform: ubuntu-22.04-arm # [linux, ARM64] + target: '' - platform: windows-latest # [windows, x64] target: '' @@ -352,6 +356,10 @@ jobs: target: '' - platform: ubuntu-24.04-arm # [linux, ARM64] target: '' + - platform: ubuntu-22.04 # [linux, x64] + target: '' + - platform: ubuntu-22.04-arm # [linux, ARM64] + target: '' - platform: windows-latest # [windows, x64] target: '' steps: From 74b8525e5c5cd25fbfda17a343317acbbd57ad96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Lars=C3=A9n?= Date: Sun, 30 Nov 2025 20:39:52 +0100 Subject: [PATCH 2/5] Upgrade build dependencies --- .github/workflows/publish.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 70c57ae19c..fe63c92176 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -176,6 +176,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt update; + sudo apt upgrade; sudo apt install -y \ build-essential \ curl \ @@ -188,12 +189,12 @@ jobs: xdg-utils; sudo apt install -y \ - libwebkit2gtk-4.1-0=2.44.0-2 \ - libwebkit2gtk-4.1-dev=2.44.0-2 \ - libjavascriptcoregtk-4.1-0=2.44.0-2 \ - libjavascriptcoregtk-4.1-dev=2.44.0-2 \ - gir1.2-javascriptcoregtk-4.1=2.44.0-2 \ - gir1.2-webkit2-4.1=2.44.0-2; + 'libwebkit2gtk-4.1-0=2.50.*' \ + 'libwebkit2gtk-4.1-dev=2.50.*' \ + 'libjavascriptcoregtk-4.1-0=2.50.*' \ + 'libjavascriptcoregtk-4.1-dev=2.50.*' \ + 'gir1.2-javascriptcoregtk-4.1=2.50.*' \ + 'gir1.2-webkit2-4.1=2.50.*'; - uses: actions/download-artifact@v6 name: Download SvelteKit build output From 5f9f5315608153ad53916548a5f20b0f5e7917d7 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Mon, 1 Dec 2025 08:31:34 +0100 Subject: [PATCH 3/5] Make the rust-cache specific to the platform when publishing. That way we can be sure that differences in compiler versions or other subleties won't throw the build off course. Cargo/rustc definitely is buggy in that regard. --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index fe63c92176..ef1f13a5bf 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -145,7 +145,7 @@ jobs: - name: Rust Cache ${{ matrix.target }} uses: Swatinem/rust-cache@v2.8.1 with: - shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }} + shared-key: app-release-build-${{ github.event.inputs.channel || 'nightly' }}${{ matrix.target }}${{ matrix.platform }} - name: Init Node Environment uses: ./.github/actions/init-env-node From 2df80e93acf7fabad540fb71b961a6cc0ea2cd28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Lars=C3=A9n?= Date: Wed, 3 Dec 2025 21:18:37 +0100 Subject: [PATCH 4/5] Revert "Upgrade build dependencies" This reverts commit 74b8525e5c5cd25fbfda17a343317acbbd57ad96. Upgrading the Linux build dependencies causes a whole host of issues with the AppImage and makes the compatibility worse overall. --- .github/workflows/publish.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index ef1f13a5bf..1912cea33d 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -176,7 +176,6 @@ jobs: if: runner.os == 'Linux' run: | sudo apt update; - sudo apt upgrade; sudo apt install -y \ build-essential \ curl \ @@ -189,12 +188,12 @@ jobs: xdg-utils; sudo apt install -y \ - 'libwebkit2gtk-4.1-0=2.50.*' \ - 'libwebkit2gtk-4.1-dev=2.50.*' \ - 'libjavascriptcoregtk-4.1-0=2.50.*' \ - 'libjavascriptcoregtk-4.1-dev=2.50.*' \ - 'gir1.2-javascriptcoregtk-4.1=2.50.*' \ - 'gir1.2-webkit2-4.1=2.50.*'; + libwebkit2gtk-4.1-0=2.44.0-2 \ + libwebkit2gtk-4.1-dev=2.44.0-2 \ + libjavascriptcoregtk-4.1-0=2.44.0-2 \ + libjavascriptcoregtk-4.1-dev=2.44.0-2 \ + gir1.2-javascriptcoregtk-4.1=2.44.0-2 \ + gir1.2-webkit2-4.1=2.44.0-2; - uses: actions/download-artifact@v6 name: Download SvelteKit build output From dd2164e88744b04603ae64735df19a8a0eb7253e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Lars=C3=A9n?= Date: Wed, 3 Dec 2025 22:07:55 +0100 Subject: [PATCH 5/5] Add distro codename into RELEASE_DIR path for linux The RELEASE_DIR path currently determines the S3 object key (perhaps a bit obtuse?), so it must be different for Ubuntu 22.04 and Ubuntu 24.04. Using their codenames (i.e. "jammy" and "noble") seems like a good choice. --- scripts/release.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/release.sh b/scripts/release.sh index 5f53c3ae85..a98f637632 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -219,7 +219,15 @@ else BUNDLE_DIR=$(readlink -f "$PWD/../target/release/bundle") fi +# The release dir determines a (significant portion of) the final S3 object key. RELEASE_DIR="$DIST/$OS/$ARCH" +if [ "$OS" = "linux" ]; then + # We build for multiple linux distros and need distinct keys for them. + RELEASE_DIR="$DIST/$OS/$(lsb_release -cs)/$ARCH" +fi + +echo "Resolved RELEASE_DIR=$RELEASE_DIR" + mkdir -p "$RELEASE_DIR" if [ "$OS" = "macos" ]; then