Stop fetching emsdk from conda-forge

compiler-research · Nov 5, 2024 · c12ccee · c12ccee
1 parent a0f92be
commit c12ccee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -232,19 +232,21 @@ jobs:
       - name: Setup emsdk
         shell: bash -l {0}
         run: |
-          emsdk install ${{matrix.emsdk_ver}}     
+          cd $HOME
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install  ${{ matrix.emsdk_ver }}
 
       - name: Build xeus-cpp
         shell: bash -l {0}
         run: |
-          emsdk activate ${{matrix.emsdk_ver}}
-          source $CONDA_EMSDK_DIR/emsdk_env.sh
+          $HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
+          source $HOME/emsdk/emsdk_env.sh
           micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
           
           mkdir build
           pushd build
 
-          export EMPACK_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 CMAKE_PREFIX_PATH=$PREFIX

diff --git a/README.md b/README.md
@@ -78,17 +78,19 @@ 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
-emsdk install 3.1.45
-emsdk activate 3.1.45
-source $CONDA_EMSDK_DIR/emsdk_env.sh
+cd $HOME
+git clone https://github.com/emscripten-core/emsdk.git
+cd emsdk
+./emsdk install 3.1.45
+./emsdk activate 3.1.45
+source $HOME/emsdk/emsdk_env.sh
 ```
 
 You are now in a position to build the xeus-cpp kernel. You build it by executing the following
 ```bash
 micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
 mkdir build
 pushd build
-export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
 export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host 
 export CMAKE_PREFIX_PATH=$PREFIX
 export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX

diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml
@@ -2,6 +2,4 @@ name: xeus-cpp-wasm-build
 channels:
   - conda-forge
 dependencies:
-  - cmake
-  - emsdk >=3.1.11
-  - empack >=2.0.1
+  - cmake