Skip to content

Commit

Permalink
Revert "feat(ci): Build on ubuntu-22.0.4 with webkit pinned to 2.36.0…
Browse files Browse the repository at this point in the history
… to support old systems"

This reverts commit 23d22b5.
  • Loading branch information
binarybaron committed Nov 26, 2024
1 parent b2e74df commit f3fc15d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build-gui-release-binaries-cb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: ""
Expand All @@ -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 \
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/build-gui-release-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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 \
Expand All @@ -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
Expand Down

0 comments on commit f3fc15d

Please sign in to comment.