Skip to content
1 change: 0 additions & 1 deletion .github/workflows/deploy-github-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
include:
- name: Github-page
os: ubuntu-24.04
emsdk_ver: "3.1.45"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect

steps:
- uses: actions/checkout@v4
with:
Expand Down
22 changes: 7 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,23 +198,22 @@ jobs:
include:
- name: ubu24
os: ubuntu-24.04-arm
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to ubuntu-24.04
for now. I see some error involving mamba here. I've raised it to the mamba folks !

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' }}
Expand All @@ -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: |
Expand All @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions docs/source/InstallationAndUsage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,11 @@ These instructions will assume you have cmake installed on your system. First cl
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
cd ./xeus-cpp


You'll now want to make sure you are using the same emsdk as the rest of our dependencies. This can be achieved by executing
the following

.. code-block:: bash


micromamba create -f environment-wasm-build.yml -y
micromamba activate xeus-cpp-wasm-build

Expand Down
4 changes: 2 additions & 2 deletions environment-wasm-build.yml
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
4 changes: 2 additions & 2 deletions environment-wasm-host.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: xeus-cpp-wasm-host
channels:
- https://repo.mamba.pm/emscripten-forge
- https://repo.prefix.dev/emscripten-forge-dev
- https://repo.mamba.pm/conda-forge
dependencies:
- emscripten-abi==3.1.45
- emscripten-abi==3.1.73
- nlohmann_json
- xeus-lite
- xeus
Expand Down
Loading