From f3fc15daeb5e5aab595aebc39460f86f42552d16 Mon Sep 17 00:00:00 2001 From: Binarybaron Date: Tue, 26 Nov 2024 13:30:09 +0100 Subject: [PATCH] Revert "feat(ci): Build on ubuntu-22.0.4 with webkit pinned to 2.36.0 to support old systems" This reverts commit 23d22b579214cbfb67d0c369bcd4d38431bb5b10. --- .../build-gui-release-binaries-cb.yml | 18 +++++++++--------- .../workflows/build-gui-release-binaries.yml | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-gui-release-binaries-cb.yml b/.github/workflows/build-gui-release-binaries-cb.yml index 1d1e6cc3..df6b43f0 100644 --- a/.github/workflows/build-gui-release-binaries-cb.yml +++ b/.github/workflows/build-gui-release-binaries-cb.yml @@ -7,7 +7,7 @@ on: env: # We build on an older version to support older glib versions - UBUNTU: "ubuntu-22.04" + UBUNTU: "ubuntu-24.04" MACOS_ARM: "macos-latest" MACOS_INTEL: "macos-13" WINDOWS: "windows-latest" @@ -36,7 +36,7 @@ jobs: args: "--target aarch64-apple-darwin" - platform: "macos-13" # For Intel-based Macs args: "--target x86_64-apple-darwin" - - platform: "ubuntu-22.04" + - platform: "ubuntu-24.04" args: "" - platform: "windows-latest" args: "" @@ -57,7 +57,7 @@ jobs: targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above. + if: matrix.platform == 'ubuntu-24.04' # This must match the platform value defined above. run: | sudo apt update; sudo apt install -y \ @@ -71,12 +71,12 @@ jobs: librsvg2-dev; sudo apt install -y \ - libwebkit2gtk-4.1-0=2.36.0 \ - libwebkit2gtk-4.1-dev=2.36.0 \ - libjavascriptcoregtk-4.1-0=2.36.0 \ - libjavascriptcoregtk-4.1-dev=2.36.0 \ - gir1.2-javascriptcoregtk-4.1=2.36.0 \ - gir1.2-webkit2-4.1=2.36.0; + 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; - name: Install Frontend Dependencies working-directory: src-gui diff --git a/.github/workflows/build-gui-release-binaries.yml b/.github/workflows/build-gui-release-binaries.yml index 4f46ed14..b9c6339f 100644 --- a/.github/workflows/build-gui-release-binaries.yml +++ b/.github/workflows/build-gui-release-binaries.yml @@ -20,7 +20,7 @@ jobs: args: "--target aarch64-apple-darwin" - platform: "macos-13" # for Intel based macs. args: "--target x86_64-apple-darwin" - - platform: "ubuntu-22.04" # We build on an older version to support older glib versions + - platform: "ubuntu-24.04" # We build on an older version to support older glib versions args: "" - platform: "windows-latest" args: "" @@ -43,7 +43,7 @@ jobs: targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above. + if: matrix.platform == 'ubuntu-24.04' # This must match the platform value defined above. run: | sudo apt update; sudo apt install -y \ @@ -57,12 +57,12 @@ jobs: librsvg2-dev; sudo apt install -y \ - libwebkit2gtk-4.1-0=2.36.0 \ - libwebkit2gtk-4.1-dev=2.36.0 \ - libjavascriptcoregtk-4.1-0=2.36.0 \ - libjavascriptcoregtk-4.1-dev=2.36.0 \ - gir1.2-javascriptcoregtk-4.1=2.36.0 \ - gir1.2-webkit2-4.1=2.36.0; + 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; - name: install frontend dependencies working-directory: src-gui