From 04c9e2be08e3fb1f86b42af25f7b9c97e138cf10 Mon Sep 17 00:00:00 2001 From: Sudara Date: Thu, 25 Apr 2024 13:31:02 +0200 Subject: [PATCH 1/3] Remove Linux workaround See https://github.com/actions/runner-images/issues/9679 --- .github/workflows/cmake_ctest.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/cmake_ctest.yml b/.github/workflows/cmake_ctest.yml index 6505513..1e002b7 100644 --- a/.github/workflows/cmake_ctest.yml +++ b/.github/workflows/cmake_ctest.yml @@ -51,9 +51,6 @@ jobs: # Thanks to McMartin & co https://forum.juce.com/t/list-of-juce-dependencies-under-linux/15121/44 run: | sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev xvfb ninja-build - # downgrade gcc to workaround 22.04 and C++20 issue - # see: https://github.com/actions/runner-images/issues/8659 - sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.6 libc6-dev=2.35-0ubuntu3.6 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 sudo /usr/bin/Xvfb $DISPLAY & - name: Cache IPP (Windows) From 33096e5605074e546a3cca6061c52b408ea222bb Mon Sep 17 00:00:00 2001 From: Sudara Date: Thu, 25 Apr 2024 14:33:00 +0200 Subject: [PATCH 2/3] Mitigate linux issue ala valentine https://github.com/tote-bag-labs/valentine/blob/main/.github/workflows/cmake_ctest.yml --- .github/workflows/cmake_ctest.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/cmake_ctest.yml b/.github/workflows/cmake_ctest.yml index 1e002b7..9b095ea 100644 --- a/.github/workflows/cmake_ctest.yml +++ b/.github/workflows/cmake_ctest.yml @@ -51,6 +51,11 @@ jobs: # Thanks to McMartin & co https://forum.juce.com/t/list-of-juce-dependencies-under-linux/15121/44 run: | sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev xvfb ninja-build + # downgrade gcc to workaround 22.04 and C++20 issue + # see: https://github.com/actions/runner-images/issues/8659 + sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list + sudo apt-get update + sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.6 libc6-dev=2.35-0ubuntu3.6 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 sudo /usr/bin/Xvfb $DISPLAY & - name: Cache IPP (Windows) From 4f6e1265c4376247d5b94eadf7f4088f099bcf91 Mon Sep 17 00:00:00 2001 From: Sudara Date: Fri, 26 Apr 2024 14:06:05 +0200 Subject: [PATCH 3/3] Bump to ubuntu3.7 to mitigate linux build issues --- .github/workflows/cmake_ctest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake_ctest.yml b/.github/workflows/cmake_ctest.yml index 9b095ea..acc9a5d 100644 --- a/.github/workflows/cmake_ctest.yml +++ b/.github/workflows/cmake_ctest.yml @@ -55,7 +55,7 @@ jobs: # see: https://github.com/actions/runner-images/issues/8659 sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list sudo apt-get update - sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.6 libc6-dev=2.35-0ubuntu3.6 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 + sudo apt-get install -y --allow-downgrades libc6=2.35-0ubuntu3.7 libc6-dev=2.35-0ubuntu3.7 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 sudo /usr/bin/Xvfb $DISPLAY & - name: Cache IPP (Windows)