From dfa9e1ee594e665e7516dc27f7f1a3ea0b9b325e Mon Sep 17 00:00:00 2001 From: namark Date: Mon, 2 Oct 2023 21:23:43 +0400 Subject: [PATCH 1/5] Log the c++ standard library version in GHA ubuntu 20.04 PR builds. --- .github/workflows/pr_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 7b227a79264..0354743a60d 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -172,6 +172,8 @@ jobs: sudo apt install cmake g++ zip libgl-dev libssl-dev sudo apt install qt5153d qt5153d-dbg qt515base qt515base-dbg qt515charts-no-lgpl qt515connectivity qt515connectivity-dbg qt515datavis3d-no-lgpl qt515declarative qt515declarative-dbg qt515doc qt515gamepad qt515graphicaleffects qt515graphicaleffects-dbg qt515imageformats qt515imageformats-dbg qt515location qt515location-dbg qt515lottie-no-lgpl qt515multimedia qt515multimedia-dbg qt515networkauth-no-lgpl qt515opcua qt515opcua-dbg qt515quick3d-no-lgpl qt515quickcontrols qt515quickcontrols-dbg qt515quickcontrols2 qt515quickcontrols2-dbg qt515quicktimeline-no-lgpl qt515remoteobjects qt515remoteobjects-dbg qt515script qt515script-dbg qt515scxml qt515scxml-dbg qt515sensors qt515sensors-dbg qt515serialbus qt515serialbus-dbg qt515serialport qt515serialport-dbg qt515speech qt515speech-dbg qt515svg qt515svg-dbg qt515tools qt515tools-dbg qt515translations qt515wayland qt515wayland-dbg qt515webchannel qt515webchannel-dbg qt515webengine qt515webengine-dbg qt515webglplugin-no-lgpl qt515websockets qt515websockets-dbg qt515x11extras qt515x11extras-dbg qt515xmlpatterns qt515xmlpatterns-dbg + + strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX fi else # macOS From 8aeb7ed7c757969c1094ad908cd044262c987ec0 Mon Sep 17 00:00:00 2001 From: namark Date: Mon, 2 Oct 2023 23:04:25 +0400 Subject: [PATCH 2/5] GHA PR build log presence of g++-11 and 12. --- .github/workflows/pr_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 0354743a60d..daa5f16028b 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -174,6 +174,7 @@ jobs: sudo apt install qt5153d qt5153d-dbg qt515base qt515base-dbg qt515charts-no-lgpl qt515connectivity qt515connectivity-dbg qt515datavis3d-no-lgpl qt515declarative qt515declarative-dbg qt515doc qt515gamepad qt515graphicaleffects qt515graphicaleffects-dbg qt515imageformats qt515imageformats-dbg qt515location qt515location-dbg qt515lottie-no-lgpl qt515multimedia qt515multimedia-dbg qt515networkauth-no-lgpl qt515opcua qt515opcua-dbg qt515quick3d-no-lgpl qt515quickcontrols qt515quickcontrols-dbg qt515quickcontrols2 qt515quickcontrols2-dbg qt515quicktimeline-no-lgpl qt515remoteobjects qt515remoteobjects-dbg qt515script qt515script-dbg qt515scxml qt515scxml-dbg qt515sensors qt515sensors-dbg qt515serialbus qt515serialbus-dbg qt515serialport qt515serialport-dbg qt515speech qt515speech-dbg qt515svg qt515svg-dbg qt515tools qt515tools-dbg qt515translations qt515wayland qt515wayland-dbg qt515webchannel qt515webchannel-dbg qt515webengine qt515webengine-dbg qt515webglplugin-no-lgpl qt515websockets qt515websockets-dbg qt515x11extras qt515x11extras-dbg qt515xmlpatterns qt515xmlpatterns-dbg strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX + which g++-11 || which g++-12 || true fi else # macOS From b430f03ae07cc9ea3d3859cff251f48186cde0be Mon Sep 17 00:00:00 2001 From: namark Date: Tue, 3 Oct 2023 08:46:06 +0400 Subject: [PATCH 3/5] GHA PR build attempt to free up space and downgrade libstdc++. --- .github/workflows/pr_build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index daa5f16028b..7b86c440720 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -174,7 +174,19 @@ jobs: sudo apt install qt5153d qt5153d-dbg qt515base qt515base-dbg qt515charts-no-lgpl qt515connectivity qt515connectivity-dbg qt515datavis3d-no-lgpl qt515declarative qt515declarative-dbg qt515doc qt515gamepad qt515graphicaleffects qt515graphicaleffects-dbg qt515imageformats qt515imageformats-dbg qt515location qt515location-dbg qt515lottie-no-lgpl qt515multimedia qt515multimedia-dbg qt515networkauth-no-lgpl qt515opcua qt515opcua-dbg qt515quick3d-no-lgpl qt515quickcontrols qt515quickcontrols-dbg qt515quickcontrols2 qt515quickcontrols2-dbg qt515quicktimeline-no-lgpl qt515remoteobjects qt515remoteobjects-dbg qt515script qt515script-dbg qt515scxml qt515scxml-dbg qt515sensors qt515sensors-dbg qt515serialbus qt515serialbus-dbg qt515serialport qt515serialport-dbg qt515speech qt515speech-dbg qt515svg qt515svg-dbg qt515tools qt515tools-dbg qt515translations qt515wayland qt515wayland-dbg qt515webchannel qt515webchannel-dbg qt515webengine qt515webengine-dbg qt515webglplugin-no-lgpl qt515websockets qt515websockets-dbg qt515x11extras qt515x11extras-dbg qt515xmlpatterns qt515xmlpatterns-dbg strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX - which g++-11 || which g++-12 || true + sudo df -h + + # attempt to free up space + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker image ls -aq) + + # downgrade libstdc++6 to what is normal for ubuntu20.04 + sudo apt-get install --allow-downgrades --no-remove --reinstall -y libstdc++6=10.5.0-1ubuntu1~20.04 + + strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX + sudo df -h fi else # macOS From 84d3817cf877a724fe23c80ad7827e9b7f988f66 Mon Sep 17 00:00:00 2001 From: namark Date: Tue, 3 Oct 2023 10:56:30 +0400 Subject: [PATCH 4/5] Minor comment change. --- .github/workflows/pr_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 7b86c440720..1cb9d3b06e1 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -182,7 +182,7 @@ jobs: sudo apt clean docker rmi $(docker image ls -aq) - # downgrade libstdc++6 to what is normal for ubuntu20.04 + # downgrade libstdc++6 to what is normal for Ubuntu 20.04 sudo apt-get install --allow-downgrades --no-remove --reinstall -y libstdc++6=10.5.0-1ubuntu1~20.04 strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX From 055c913cb29606c84c970dac13f8b276c9f32c39 Mon Sep 17 00:00:00 2001 From: namark Date: Tue, 3 Oct 2023 10:57:10 +0400 Subject: [PATCH 5/5] Added GHA workarounds for recent issues to master build. --- .github/workflows/master_build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 9e36df772ac..e67a71ee080 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -149,6 +149,21 @@ jobs: sudo apt install cmake g++ zip libgl-dev libssl-dev sudo apt install qt5153d qt5153d-dbg qt515base qt515base-dbg qt515charts-no-lgpl qt515connectivity qt515connectivity-dbg qt515datavis3d-no-lgpl qt515declarative qt515declarative-dbg qt515doc qt515gamepad qt515graphicaleffects qt515graphicaleffects-dbg qt515imageformats qt515imageformats-dbg qt515location qt515location-dbg qt515lottie-no-lgpl qt515multimedia qt515multimedia-dbg qt515networkauth-no-lgpl qt515opcua qt515opcua-dbg qt515quick3d-no-lgpl qt515quickcontrols qt515quickcontrols-dbg qt515quickcontrols2 qt515quickcontrols2-dbg qt515quicktimeline-no-lgpl qt515remoteobjects qt515remoteobjects-dbg qt515script qt515script-dbg qt515scxml qt515scxml-dbg qt515sensors qt515sensors-dbg qt515serialbus qt515serialbus-dbg qt515serialport qt515serialport-dbg qt515speech qt515speech-dbg qt515svg qt515svg-dbg qt515tools qt515tools-dbg qt515translations qt515wayland qt515wayland-dbg qt515webchannel qt515webchannel-dbg qt515webengine qt515webengine-dbg qt515webglplugin-no-lgpl qt515websockets qt515websockets-dbg qt515x11extras qt515x11extras-dbg qt515xmlpatterns qt515xmlpatterns-dbg + + strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX + sudo df -h + + # attempt to free up space + sudo swapoff -a + sudo rm -f /swapfile + sudo apt clean + docker rmi $(docker image ls -aq) + + # downgrade libstdc++6 to what is normal for Ubuntu 20.04 + sudo apt-get install --allow-downgrades --no-remove --reinstall -y libstdc++6=10.5.0-1ubuntu1~20.04 + + strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX + sudo df -h fi else # macOS