From 1b1b547b461780082339c88d5514c18b551cd18d Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 07:52:41 +0000 Subject: [PATCH 1/5] Remove environment-wasm-build.yml --- .github/workflows/main.yml | 12 ------------ environment-wasm-build.yml | 5 ----- 2 files changed, 17 deletions(-) delete mode 100644 environment-wasm-build.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6a5e40ff..9c283586 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -187,19 +187,15 @@ jobs: - name: ubu24 os: ubuntu-24.04 emsdk_ver: "3.1.45" - micromamba_shell_init: bash - name: osx13-x86 os: macos-13 emsdk_ver: "3.1.45" - micromamba_shell_init: bash - name: osx14-arm os: macos-14 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 @@ -208,11 +204,6 @@ jobs: - name: install mamba uses: mamba-org/setup-micromamba@main - with: - 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' }} @@ -231,7 +222,6 @@ jobs: echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV - name: Setup emsdk - shell: bash -l {0} run: | cd $HOME git clone https://github.com/emscripten-core/emsdk.git @@ -239,7 +229,6 @@ jobs: ./emsdk install ${{ matrix.emsdk_ver }} - name: Build xeus-cpp - shell: bash -l {0} run: | $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}} source $HOME/emsdk/emsdk_env.sh @@ -263,7 +252,6 @@ jobs: emmake make -j ${{ env.ncpus }} install - name: Jupyter Lite integration - shell: bash -l {0} run: | micromamba create -n xeus-lite-host jupyterlite-core micromamba activate xeus-lite-host diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml deleted file mode 100644 index 30c02ed2..00000000 --- a/environment-wasm-build.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: xeus-cpp-wasm-build -channels: - - conda-forge -dependencies: - - cmake \ No newline at end of file From 427170fcf9fe565a04c7dc0da6d6ae347ad8cf01 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 07:54:57 +0000 Subject: [PATCH 2/5] Remove environment-wasm-build.yml from README.md --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 3c291979..d6854470 100644 --- a/README.md +++ b/README.md @@ -69,13 +69,6 @@ git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git cd ./xeus-cpp ``` -Now you'll want to create a clean mamba environment containing the tools you'll need to do a wasm build. This can be done by executing -the following -```bash -micromamba create -f environment-wasm-build.yml -y -micromamba activate xeus-cpp-wasm-build -``` - 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 ```bash cd $HOME From 721004b9f2a405ebbf23b073f8a20cef5cc12cda Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 07:58:14 +0000 Subject: [PATCH 3/5] Update environment-wasm-build.yml from deploy-github-page.yml --- .github/workflows/deploy-github-page.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index db1f1b1e..c1a25e87 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -29,10 +29,6 @@ jobs: - name: install mamba uses: mamba-org/setup-micromamba@main - with: - environment-file: environment-wasm-build.yml - init-shell: bash - environment-name: xeus-cpp-wasm-build - name: Setup default Build Type on *nux if: ${{ runner.os != 'windows' }} @@ -40,7 +36,6 @@ jobs: echo "ncpus=$(nproc --all)" >> $GITHUB_ENV - name: Setup emsdk - shell: bash -l {0} run: | cd $HOME git clone https://github.com/emscripten-core/emsdk.git @@ -48,7 +43,6 @@ jobs: ./emsdk install ${{ matrix.emsdk_ver }} - name: Build xeus-cpp - shell: bash -l {0} run: | $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}} source $HOME/emsdk/emsdk_env.sh @@ -72,7 +66,6 @@ jobs: emmake make -j ${{ env.ncpus }} install - name: Jupyter Lite integration - shell: bash -l {0} run: | micromamba create -n xeus-lite-host jupyterlite-core micromamba activate xeus-lite-host From 239ea0f56decaf13dd810d002b55a2c4d0120391 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:09:29 +0000 Subject: [PATCH 4/5] Revert changes to ci and update readme.md about cmake --- .github/workflows/deploy-github-page.yml | 5 +++++ .github/workflows/main.yml | 12 +++++++++++- README.md | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index c1a25e87..fa0e7442 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -29,6 +29,8 @@ jobs: - name: install mamba uses: mamba-org/setup-micromamba@main + with: + init-shell: bash - name: Setup default Build Type on *nux if: ${{ runner.os != 'windows' }} @@ -36,6 +38,7 @@ jobs: echo "ncpus=$(nproc --all)" >> $GITHUB_ENV - name: Setup emsdk + shell: bash -l {0} run: | cd $HOME git clone https://github.com/emscripten-core/emsdk.git @@ -43,6 +46,7 @@ jobs: ./emsdk install ${{ matrix.emsdk_ver }} - name: Build xeus-cpp + shell: bash -l {0} run: | $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}} source $HOME/emsdk/emsdk_env.sh @@ -66,6 +70,7 @@ jobs: emmake make -j ${{ env.ncpus }} install - name: Jupyter Lite integration + shell: bash -l {0} run: | micromamba create -n xeus-lite-host jupyterlite-core micromamba activate xeus-lite-host diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c283586..6a2efe30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -187,15 +187,19 @@ jobs: - name: ubu24 os: ubuntu-24.04 emsdk_ver: "3.1.45" + micromamba_shell_init: bash - name: osx13-x86 os: macos-13 emsdk_ver: "3.1.45" + micromamba_shell_init: bash - name: osx14-arm os: macos-14 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 @@ -204,6 +208,9 @@ jobs: - name: install mamba uses: mamba-org/setup-micromamba@main + with: + init-shell: >- + ${{ matrix.micromamba_shell_init }} - name: Setup default Build Type on *nux if: ${{ runner.os != 'windows' }} @@ -222,6 +229,7 @@ jobs: echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV - name: Setup emsdk + shell: bash -l {0} run: | cd $HOME git clone https://github.com/emscripten-core/emsdk.git @@ -229,6 +237,7 @@ jobs: ./emsdk install ${{ matrix.emsdk_ver }} - name: Build xeus-cpp + shell: bash -l {0} run: | $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}} source $HOME/emsdk/emsdk_env.sh @@ -251,7 +260,8 @@ jobs: .. emmake make -j ${{ env.ncpus }} install - - name: Jupyter Lite integration + - name: Jupyter Lite integration + shell: bash -l {0} run: | micromamba create -n xeus-lite-host jupyterlite-core micromamba activate xeus-lite-host diff --git a/README.md b/README.md index d6854470..a25a0cac 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ to perform the python tests. ## Installation within a mamba environment (wasm build instructions) -First clone the repository, and move into that directory +These instructions will assume you have cmake installed on your system. First clone the repository, and move into that directory ```bash git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git cd ./xeus-cpp From dc1cfe3d9cd9e1448433e901ca37690b3cc42292 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:11:24 +0000 Subject: [PATCH 5/5] Add back random single space 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 6a2efe30..f2d5f16e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -260,7 +260,7 @@ jobs: .. emmake make -j ${{ env.ncpus }} install - - name: Jupyter Lite integration + - name: Jupyter Lite integration shell: bash -l {0} run: | micromamba create -n xeus-lite-host jupyterlite-core