From 6440e387d69b14a30923281c3f01cf48004502df Mon Sep 17 00:00:00 2001 From: raptor Date: Sun, 14 Aug 2022 19:00:18 -0600 Subject: [PATCH] Fix Linux/macOS builds with c++20 dialect --- .github/workflows/package-linux.yml | 6 +++++- .github/workflows/package-macos.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/package-linux.yml b/.github/workflows/package-linux.yml index a282377ac..d572bed7d 100644 --- a/.github/workflows/package-linux.yml +++ b/.github/workflows/package-linux.yml @@ -20,11 +20,15 @@ jobs: - name: Install dependencies run: | sudo apt-get update + sudo apt-get install gcc-10 g++-10 sudo apt-get install -y scons libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libphysfs-dev - name: Configure and build run: scons -j`nproc` opengl=1 sdl2=1 sdlmixer=1 - + env: + CC: gcc-10 + CXX: g++-10 + - name: Package AppImage run: ./contrib/packaging/linux/build_package.sh diff --git a/.github/workflows/package-macos.yml b/.github/workflows/package-macos.yml index 494a4f825..7ed8d94e9 100644 --- a/.github/workflows/package-macos.yml +++ b/.github/workflows/package-macos.yml @@ -12,7 +12,7 @@ on: jobs: macos: name: macOS Apps - runs-on: macos-10.15 + runs-on: macos-11 steps: - name: Clone repository uses: actions/checkout@v3 @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | - brew install scons sdl2 sdl2_image sdl2_mixer physfs pkg-config dylibbundler + brew install scons sdl2 sdl2_image sdl2_mixer jpeg physfs pkg-config dylibbundler - name: Configure and build run: scons -j2 opengl=1 sdl2=1 sdlmixer=1 macos_add_frameworks=0 macos_bundle_libs=1