Merge pull request #3833 from Rohde-Schwarz/ci/update_clang_workaround

Update GitHub Actions workaround / Fix emcc build
randombit · Dec 13, 2023 · 858a383 · 858a383
2 parents 92e5dd7 + c54c182
commit 858a383
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/scripts/ci/setup_gh_actions.sh b/src/scripts/ci/setup_gh_actions.sh
@@ -21,7 +21,7 @@ if type -p "apt-get"; then
     # Hack to deal with 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.4 libc6-dev=2.35-0ubuntu3.4 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.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
 
     # Normal workflow follows
     #sudo apt-get -qq update
@@ -97,6 +97,7 @@ if type -p "apt-get"; then
     fi
 else
     export HOMEBREW_NO_AUTO_UPDATE=1
+    export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
     brew install ccache
 
     if [ "$TARGET" = "shared" ]; then