From 0cb6724a13618808ecd93a6084eaa007a038899b Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:40:57 +0000 Subject: [PATCH 01/10] Upgrade emsdk to 3.1.73 ci --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fd0ebf8c..fa94a8e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -192,23 +192,23 @@ jobs: include: - name: ubu24 os: ubuntu-24.04 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" micromamba_shell_init: bash - name: ubu22 os: ubuntu-22.04 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" micromamba_shell_init: bash - name: osx13-x86 os: macos-13 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" micromamba_shell_init: bash - name: osx14-arm os: macos-14 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" micromamba_shell_init: bash - name: osx15-arm os: macos-15 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" micromamba_shell_init: bash steps: From 32e0102e8b69b6d0d9153e19db6ec0e8768a2f30 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:41:35 +0000 Subject: [PATCH 02/10] Upgrade to emsdk 3.1.73 README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c987a379..3118a719 100644 --- a/README.md +++ b/README.md @@ -69,13 +69,13 @@ git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git cd ./xeus-cpp ``` -You'll now want to make sure you're using emsdk version "3.1.45" and activate it. You can get this by executing the following +You'll now want to make sure you're using emsdk version "3.1.73" and activate it. You can get this by executing the following ```bash cd $HOME git clone https://github.com/emscripten-core/emsdk.git cd emsdk -./emsdk install 3.1.45 -./emsdk activate 3.1.45 +./emsdk install 3.1.73 +./emsdk activate 3.1.73 source $HOME/emsdk/emsdk_env.sh ``` From 7ca05d2de8be098595d3ede3bda0de15567f7c47 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:42:13 +0000 Subject: [PATCH 03/10] Upgrade to emsdk 3.1.73 InstallationAndUsage.rst --- docs/source/InstallationAndUsage.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index e24cb9b4..6fc8c489 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -51,14 +51,14 @@ These instructions will assume you have cmake installed on your system. First cl cd ./xeus-cpp -You'll now want to make sure you're using emsdk version "3.1.45" and activate it. You can get this by executing the following +You'll now want to make sure you're using emsdk version "3.1.73" and activate it. You can get this by executing the following .. code-block:: bash cd $HOME git clone https://github.com/emscripten-core/emsdk.git cd emsdk - ./emsdk install 3.1.45 - ./emsdk activate 3.1.45 + ./emsdk install 3.1.73 + ./emsdk activate 3.1.73 source $HOME/emsdk/emsdk_env.sh From 079e1935ffef549a793033d6c4974e14b81f57c7 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:43:50 +0000 Subject: [PATCH 04/10] Upgrade to emsdk 3.1.73 deploy-github-page.yml --- .github/workflows/deploy-github-page.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index 1bfca783..9d92b8f1 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -21,7 +21,7 @@ jobs: include: - name: Github-page os: macos-15 - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v4 with: From eb506aefc9b6034d6fe9ce96913ed3230d667196 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 11:04:00 +0000 Subject: [PATCH 05/10] Update environment files to emsdk 3.1.73 --- environment-wasm-build.yml | 2 +- environment-wasm-host.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml index a074ec55..6bbb0a29 100644 --- a/environment-wasm-build.yml +++ b/environment-wasm-build.yml @@ -4,4 +4,4 @@ channels: - conda-forge dependencies: - cmake - - emscripten_emscripten-wasm32==3.1.45 \ No newline at end of file + - emscripten_emscripten-wasm32==3.1.73 \ No newline at end of file diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index a7ea2462..18ee09fb 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -3,7 +3,7 @@ channels: - https://repo.mamba.pm/emscripten-forge - https://repo.mamba.pm/conda-forge dependencies: - - emscripten-abi==3.1.45 + - emscripten-abi==3.1.73 - nlohmann_json - xeus-lite - xeus From f1d17c8cd53b2f61d81551296e5fd0907158e22c Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 11:04:42 +0000 Subject: [PATCH 06/10] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6fee0cab..fe070a79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -195,7 +195,8 @@ jobs: micromamba_shell_init: bash - name: osx15-arm os: macos-15 - + micromamba_shell_init: bash + steps: - uses: actions/checkout@v4 with: From d58843dc6429ee832ef4b743969231e771195f8d Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 11:05:05 +0000 Subject: [PATCH 07/10] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe070a79..e38fc178 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -195,7 +195,7 @@ jobs: micromamba_shell_init: bash - name: osx15-arm os: macos-15 - micromamba_shell_init: bash + micromamba_shell_init: bash steps: - uses: actions/checkout@v4 From 4100e960cc48c83194fb8b038a7aef272ccb1089 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 11:11:48 +0000 Subject: [PATCH 08/10] Update main.yml --- .github/workflows/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0beee7ca..9ecb942c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -230,14 +230,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: | From d03b24f2f48d5ee9c765e7cd528c41f4e6476606 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 11:27:14 +0000 Subject: [PATCH 09/10] Update main.yml --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ecb942c..e9563165 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -207,12 +207,13 @@ jobs: - 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' }} @@ -240,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 \ From 26091d562fc76ae7074a56e17af561226af5c17f Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 22 Jan 2025 12:41:04 +0000 Subject: [PATCH 10/10] Try suggestion --- environment-wasm-build.yml | 2 +- environment-wasm-host.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml index 6bbb0a29..12afc8d8 100644 --- a/environment-wasm-build.yml +++ b/environment-wasm-build.yml @@ -1,6 +1,6 @@ name: xeus-cpp-wasm-build channels: - - https://repo.mamba.pm/emscripten-forge + - https://repo.prefix.dev/emscripten-forge-dev - conda-forge dependencies: - cmake diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index 18ee09fb..ea6fe04e 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -1,6 +1,6 @@ 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.73