From b0021e5862faa1271598b9a7a374baf09f5d1fdc Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Wed, 29 May 2024 13:28:32 -0300 Subject: [PATCH] ci: gcc uses -static fix #547 --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4247298c0..a272bae62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -240,9 +240,9 @@ jobs: cmake-version: ${{ matrix.compiler == 'clang' && '3.26' || '>=3.26' }} cxxstd: ${{ matrix.cxxstd }} cc: ${{ steps.setup-cpp.outputs.cc || matrix.cc }} - ccflags: ${{ matrix.ccflags }}${{ ( matrix.compiler == 'gcc' && ' -static-libstdc++') || '' }}${{ ( matrix.asan && ' -static-libasan') || '' }}${{ ( matrix.tsan && ' -static-libtsan') || '' }} + ccflags: ${{ matrix.ccflags }}${{ ( matrix.compiler == 'gcc' && ' -static') || '' }}${{ ( matrix.asan && ' -static-libasan') || '' }}${{ ( matrix.tsan && ' -static-libtsan') || '' }} cxx: ${{ steps.setup-cpp.outputs.cxx || matrix.cxx }} - cxxflags: ${{ matrix.cxxflags }}${{ ( matrix.compiler == 'gcc' && ' -static-libstdc++') || '' }}${{ ( matrix.asan && ' -static-libasan') || '' }}${{ ( matrix.tsan && ' -static-libtsan') || '' }} + cxxflags: ${{ matrix.cxxflags }}${{ ( matrix.compiler == 'gcc' && ' -static') || '' }}${{ ( matrix.asan && ' -static-libasan') || '' }}${{ ( matrix.tsan && ' -static-libtsan') || '' }} generator: Ninja toolchain: ${{ steps.package-install.outputs.vcpkg_toolchain || steps.package-install.outputs.vcpkg-toolchain }} build-type: ${{ matrix.build-type }} @@ -357,7 +357,9 @@ jobs: name: Demos timeout-minutes: 120 - runs-on: ubuntu-22.04 + # We purposefully use an older version of Ubuntu to + # ensure compatibility with the oldest supported version + runs-on: ubuntu-20.04 container: ubuntu:23.04 permissions: