From 3a3b17001e7b776d1df949ad03a34fe4f8e7ad26 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Sat, 12 Aug 2023 20:50:30 +0200 Subject: [PATCH] ci: don't use gcc-13 due to using the system's libstdc++ on AppImage --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fd85a88..d200c472 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: sudo add-apt-repository ppa:okirby/qt6-backports --yes sudo apt-get -qq update sudo apt-get upgrade - sudo apt-get -y install cmake ninja-build libhidapi-dev libsamplerate0-dev libspeex-dev libminizip-dev libsdl2-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev pkg-config zlib1g-dev binutils-dev libspeexdsp-dev qt6-base-dev libqt6svg6-dev libvulkan-dev gcc-13 g++-13 build-essential nasm git zip appstream + sudo apt-get -y install cmake ninja-build libhidapi-dev libsamplerate0-dev libspeex-dev libminizip-dev libsdl2-dev libfreetype6-dev libgl1-mesa-dev libglu1-mesa-dev pkg-config zlib1g-dev binutils-dev libspeexdsp-dev qt6-base-dev libqt6svg6-dev libvulkan-dev build-essential nasm git zip appstream - name: Prepare Environment run: | echo "GIT_REVISION=$(git describe --tags --always)" >> $GITHUB_ENV @@ -29,9 +29,8 @@ jobs: export build_dir="$(pwd)/Build/AppImage" export bin_dir="$(pwd)/Bin/AppImage" cmake -S "$src_dir" -B "$build_dir" -DCMAKE_BUILD_TYPE="Release" \ - -DPORTABLE_INSTALL="OFF" -DUPDATER=ON -DAPPIMAGE_UPDATER=ON \ - -DCMAKE_C_COMPILER=$(which gcc-13) -DCMAKE_CXX_COMPILER=$(which g++-13) \ - -DCMAKE_INSTALL_PREFIX="/usr" -G "Ninja" + -DPORTABLE_INSTALL="OFF" -DUPDATER=ON -DAPPIMAGE_UPDATER=ON -DUSE_LIBFMT=ON \ + -DCMAKE_INSTALL_PREFIX="/usr" -G "Ninja" cmake --build "$build_dir" cmake --install "$build_dir" --strip --prefix="$bin_dir/usr" shell: bash