Skip to content

Commit

Permalink
Merge pull request #4230 from reneme/workaround/emscripten
Browse files Browse the repository at this point in the history
Workaround: Older version of Emscripten
  • Loading branch information
reneme authored Jul 19, 2024
2 parents 7c07dbd + 07a5df0 commit c0b794a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
6 changes: 5 additions & 1 deletion src/scripts/ci/setup_gh_actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]
fi

if [ -d '/Applications/Xcode_15.3.app/Contents/Developer' ]; then
Expand Down

0 comments on commit c0b794a

Please sign in to comment.