From fc1a7c63da2ca5b0ef1c25a47d4341df23d4b690 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 10 Jul 2024 15:12:57 +0200 Subject: [PATCH] .github/workflows/build.yml: switch to Ubuntu 24.04 Ubuntu 24.04 comes with sane versions of fmt, nlohmann_json and OpenSSL. --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bedd059..0423a10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - id: checkout uses: actions/checkout@v4 @@ -38,9 +38,12 @@ jobs: ruby-net-ssh \ meson \ ccache \ + nlohmann-json3-dev \ + libfmt-dev \ libgtest-dev \ libcap-dev \ libseccomp-dev \ + libssl-dev \ libsystemd-dev \ libavahi-client-dev \ libmd-dev \ @@ -57,7 +60,6 @@ jobs: -Dauto_features=enabled \ -Ddocumentation=disabled \ -Dtest=true \ - --force-fallback-for=fmt,libcrypto,nlohmann_json \ -Dwrap_mode=nofallback \ output @@ -76,7 +78,7 @@ jobs: run: ./test/test_lukko.py output mini: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - id: checkout uses: actions/checkout@v4 @@ -89,6 +91,7 @@ jobs: sudo apt-get install -y --no-install-recommends \ meson \ ccache \ + libfmt-dev \ libgtest-dev \ libsodium-dev @@ -105,7 +108,6 @@ jobs: -Dtranslation=false \ -Dcontrol=false \ -Dpond=false \ - --force-fallback-for=fmt \ -Dwrap_mode=nofallback \ output