From 07a5df0d521c3a968981c997eb73a8ab1b831f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Meusel?= Date: Thu, 18 Jul 2024 19:36:42 +0200 Subject: [PATCH] Workaround: install an older emscripten --- .github/workflows/nightly.yml | 7 +++---- src/scripts/ci/setup_gh_actions.sh | 6 +++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index bb281e238f5..85681d0b431 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -62,10 +62,9 @@ jobs: - target: cross-arm64-amalgamation compiler: gcc host_os: ubuntu-24.04 -# Disabled due to https://github.com/emscripten-core/emscripten/issues/22249 -# - target: emscripten -# compiler: emcc -# host_os: macos-14 + - target: emscripten + compiler: emcc + host_os: macos-14 runs-on: ${{ matrix.host_os }} diff --git a/src/scripts/ci/setup_gh_actions.sh b/src/scripts/ci/setup_gh_actions.sh index 19fb7981cdf..47823c30db0 100755 --- a/src/scripts/ci/setup_gh_actions.sh +++ b/src/scripts/ci/setup_gh_actions.sh @@ -140,7 +140,11 @@ else boostincdir=$(brew --prefix boost)/include echo "BOOST_INCLUDEDIR=$boostincdir" >> "$GITHUB_ENV" elif [ "$TARGET" = "emscripten" ]; then - brew install emscripten + # Workaround: emscripten 3.1.63 is broken, install an older one... + brew tap-new botan/local-emscripten + brew tap --force homebrew/core + brew extract --version=3.1.61 emscripten botan/local-emscripten + brew install emscripten@3.1.61 fi if [ -d '/Applications/Xcode_15.3.app/Contents/Developer' ]; then