-
Notifications
You must be signed in to change notification settings - Fork 36
Update to emsdk 3.1.73 #224
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
0cb6724
Upgrade emsdk to 3.1.73 ci
mcbarton 32e0102
Upgrade to emsdk 3.1.73 README.md
mcbarton 7ca05d2
Upgrade to emsdk 3.1.73 InstallationAndUsage.rst
mcbarton 079e193
Upgrade to emsdk 3.1.73 deploy-github-page.yml
mcbarton 6b20f06
Merge branch 'main' into Update-to-emsdk-3.1.73
mcbarton eb506ae
Update environment files to emsdk 3.1.73
mcbarton f1d17c8
Update main.yml
mcbarton d58843d
Update main.yml
mcbarton 47a921b
Merge branch 'main' into Update-to-emsdk-3.1.73
mcbarton 4100e96
Update main.yml
mcbarton d03b24f
Update main.yml
mcbarton 26091d5
Try suggestion
mcbarton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -198,23 +198,22 @@ jobs: | |
include: | ||
- name: ubu24 | ||
os: ubuntu-24.04-arm | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Change to ubuntu-24.04 |
||
emsdk_ver: "3.1.45" | ||
micromamba_shell_init: bash | ||
- name: osx15-arm | ||
os: macos-15 | ||
emsdk_ver: "3.1.45" | ||
micromamba_shell_init: bash | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: install mamba | ||
uses: mamba-org/setup-micromamba@main | ||
with: | ||
init-shell: >- | ||
${{ matrix.micromamba_shell_init }} | ||
environment-file: environment-wasm-build.yml | ||
init-shell: ${{ matrix.micromamba_shell_init }} | ||
environment-name: xeus-cpp-wasm-build | ||
|
||
- name: Setup default Build Type on *nux | ||
if: ${{ runner.os != 'windows' }} | ||
|
@@ -232,14 +231,6 @@ jobs: | |
$env:ncpus=$([Environment]::ProcessorCount) | ||
echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV | ||
|
||
- name: Setup emsdk | ||
shell: bash -l {0} | ||
run: | | ||
cd $HOME | ||
git clone --depth=1 https://github.com/emscripten-core/emsdk.git | ||
cd emsdk | ||
./emsdk install ${{ matrix.emsdk_ver }} | ||
|
||
- name: Build xeus-cpp | ||
shell: bash -l {0} | ||
run: | | ||
|
@@ -250,9 +241,10 @@ jobs: | |
mkdir build | ||
pushd build | ||
|
||
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build | ||
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host | ||
echo "PREFIX=$PREFIX" >> $GITHUB_ENV | ||
export SYSROOT_PATH=$HOME/emsdk/upstream/emscripten/cache/sysroot | ||
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot | ||
|
||
emcmake cmake \ | ||
-DCMAKE_BUILD_TYPE=Release \ | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
name: xeus-cpp-wasm-build | ||
channels: | ||
- https://repo.mamba.pm/emscripten-forge | ||
- https://repo.prefix.dev/emscripten-forge-dev | ||
- conda-forge | ||
dependencies: | ||
- cmake | ||
- emscripten_emscripten-wasm32==3.1.45 | ||
- emscripten_emscripten-wasm32==3.1.73 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect