From 8b20bb0848ee81a8215f25264f90512ad1faed14 Mon Sep 17 00:00:00 2001 From: Simon Judd Date: Tue, 28 May 2024 13:11:36 +0930 Subject: [PATCH] Update linux CI workflow to 24.04 (#1682) * Update continuous_integration.yml Update linux CI workflow to Ubuntu 22.04 LTS (since we need wxWidgets 3.2+ now) * Update continuous_integration.yml So 22.04 doesn't have wx3.2 apparently, we'll use 24.04 then --- .github/workflows/continuous_integration.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index feaef8a17..90a2d68dc 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -17,24 +17,20 @@ jobs: } - { name: "Linux GCC", - os: ubuntu-20.04, - deps_cmdline: "sudo apt-key adv --fetch-keys https://repos.codelite.org/CodeLite.asc && \ - sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe' && \ - sudo apt update && sudo apt install \ - libfluidsynth-dev libfreeimage-dev libwebkit2gtk-4.0-dev \ + os: ubuntu-24.04, + deps_cmdline: "sudo apt install \ + libfluidsynth-dev libfreeimage-dev libwebkit2gtk-4.1-dev \ libftgl-dev libgtk-3-dev liblua5.3-dev libmpg123-dev libsfml-dev \ - libwxgtk3.1unofficial-dev libwxgtk-webview3.1unofficial-dev" + libwxgtk3.2-dev libwxgtk-webview3.2-dev" } - { name: "Linux Clang", - os: ubuntu-20.04, + os: ubuntu-24.04, extra_options: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++", - deps_cmdline: "sudo apt-key adv --fetch-keys https://repos.codelite.org/CodeLite.asc && \ - sudo apt-add-repository 'deb https://repos.codelite.org/wx3.1.5/ubuntu/ focal universe' && \ - sudo apt update && sudo apt install \ - libfluidsynth-dev libfreeimage-dev libwebkit2gtk-4.0-dev \ + deps_cmdline: "sudo apt install \ + libfluidsynth-dev libfreeimage-dev libwebkit2gtk-4.1-dev \ libftgl-dev libgtk-3-dev liblua5.3-dev libmpg123-dev libsfml-dev \ - libwxgtk3.1unofficial-dev libwxgtk-webview3.1unofficial-dev" + libwxgtk3.2-dev libwxgtk-webview3.2-dev" } steps: