Skip to content

Commit 239ea0f

Browse files
authored
Revert changes to ci and update readme.md about cmake
1 parent 721004b commit 239ea0f

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

.github/workflows/deploy-github-page.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,24 @@ jobs:
2929

3030
- name: install mamba
3131
uses: mamba-org/setup-micromamba@main
32+
with:
33+
init-shell: bash
3234

3335
- name: Setup default Build Type on *nux
3436
if: ${{ runner.os != 'windows' }}
3537
run: |
3638
echo "ncpus=$(nproc --all)" >> $GITHUB_ENV
3739
3840
- name: Setup emsdk
41+
shell: bash -l {0}
3942
run: |
4043
cd $HOME
4144
git clone https://github.com/emscripten-core/emsdk.git
4245
cd emsdk
4346
./emsdk install ${{ matrix.emsdk_ver }}
4447
4548
- name: Build xeus-cpp
49+
shell: bash -l {0}
4650
run: |
4751
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
4852
source $HOME/emsdk/emsdk_env.sh
@@ -66,6 +70,7 @@ jobs:
6670
emmake make -j ${{ env.ncpus }} install
6771
6872
- name: Jupyter Lite integration
73+
shell: bash -l {0}
6974
run: |
7075
micromamba create -n xeus-lite-host jupyterlite-core
7176
micromamba activate xeus-lite-host

.github/workflows/main.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,19 @@ jobs:
187187
- name: ubu24
188188
os: ubuntu-24.04
189189
emsdk_ver: "3.1.45"
190+
micromamba_shell_init: bash
190191
- name: osx13-x86
191192
os: macos-13
192193
emsdk_ver: "3.1.45"
194+
micromamba_shell_init: bash
193195
- name: osx14-arm
194196
os: macos-14
195197
emsdk_ver: "3.1.45"
198+
micromamba_shell_init: bash
196199
- name: osx15-arm
197200
os: macos-15
198201
emsdk_ver: "3.1.45"
202+
micromamba_shell_init: bash
199203

200204
steps:
201205
- uses: actions/checkout@v4
@@ -204,6 +208,9 @@ jobs:
204208

205209
- name: install mamba
206210
uses: mamba-org/setup-micromamba@main
211+
with:
212+
init-shell: >-
213+
${{ matrix.micromamba_shell_init }}
207214
208215
- name: Setup default Build Type on *nux
209216
if: ${{ runner.os != 'windows' }}
@@ -222,13 +229,15 @@ jobs:
222229
echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV
223230
224231
- name: Setup emsdk
232+
shell: bash -l {0}
225233
run: |
226234
cd $HOME
227235
git clone https://github.com/emscripten-core/emsdk.git
228236
cd emsdk
229237
./emsdk install ${{ matrix.emsdk_ver }}
230238
231239
- name: Build xeus-cpp
240+
shell: bash -l {0}
232241
run: |
233242
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
234243
source $HOME/emsdk/emsdk_env.sh
@@ -251,7 +260,8 @@ jobs:
251260
..
252261
emmake make -j ${{ env.ncpus }} install
253262
254-
- name: Jupyter Lite integration
263+
- name: Jupyter Lite integration
264+
shell: bash -l {0}
255265
run: |
256266
micromamba create -n xeus-lite-host jupyterlite-core
257267
micromamba activate xeus-lite-host

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ to perform the python tests.
6363

6464
## Installation within a mamba environment (wasm build instructions)
6565

66-
First clone the repository, and move into that directory
66+
These instructions will assume you have cmake installed on your system. First clone the repository, and move into that directory
6767
```bash
6868
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
6969
cd ./xeus-cpp

0 commit comments

Comments
 (0)