Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,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 }}
Copy link
Member

Choose a reason for hiding this comment

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

How about we also add version 3.1.58 and/or latest to the matrix?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes this was very beneficial for me atleast for xeus-cpp-lite. I think it would surely help with xeus-r !

Copy link
Member Author

Choose a reason for hiding this comment

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

Wait actually no, I think there is a flaw here.

We fetch most things like r-base etc from emscripten-forge through environment-wasm-host.yml

We would want atleast the important packages in the toolchain like r-base, xeus-lite etc to be built against these versions too. (P.S: when I built xeus-cpp-lite against emsdk 3.1.73 ... first I had build errors cause llvm was build against 3.1.45 and once I addressed that, there were build errors from xeus-lite (some symbol mismatch or not exported) and then I built that against 3.1.73 and got xeus-cpp-lite working)

Copy link
Member Author

Choose a reason for hiding this comment

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

So I think we should stick to 1 emsdk version for all pacakges for now (and I guess once emscripten-forge migrates to a new version like latest i.e. 3.1.73 on a separate branch) we can do this.


- name: Build xeus-r
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-r-wasm-build
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-r-wasm-host
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
export CMAKE_PREFIX_PATH=$PREFIX
Expand Down
4 changes: 1 addition & 3 deletions environment-wasm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@ name: xeus-r-wasm-build
channels:
- conda-forge
dependencies:
- cmake
- emsdk >=3.1.11
- empack >=2.0.1
- cmake
Loading