Skip to content

Commit 4d923ba

Browse files
committed
CI: Same build commands as cpython_interop for other jobs
It seems the CI job for cpython_interop completes earlier compared to other CI jobs. Therefore using the same build commands as cpython_interop in other jobs.
1 parent 2068bf6 commit 4d923ba

File tree

1 file changed

+31
-16
lines changed

1 file changed

+31
-16
lines changed

.github/workflows/CI.yml

+31-16
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
116116
build_to_wasm:
117117
name: Build LPython to WASM
118-
runs-on: "ubuntu-latest"
118+
runs-on: ubuntu-latest
119119
steps:
120120
- uses: actions/checkout@v3
121121
with:
@@ -130,6 +130,7 @@ jobs:
130130
131131
- uses: hendrikmuhs/ccache-action@main
132132
with:
133+
variant: sccache
133134
key: ${{ github.job }}-${{ matrix.os }}
134135

135136
- name : Remove existing node
@@ -149,11 +150,8 @@ jobs:
149150
cd emsdk
150151
151152
./emsdk install 3.1.35
152-
153153
./emsdk activate 3.1.35
154-
155154
./emsdk install node-14.18.2-64bit
156-
157155
./emsdk activate node-14.18.2-64bit
158156
159157
- name: Show Emscripten and Node Info
@@ -173,7 +171,20 @@ jobs:
173171
set -ex
174172
source $HOME/ext/emsdk/emsdk_env.sh # Activate Emscripten
175173
./build0.sh
176-
./build_to_wasm.sh
174+
emcmake cmake . -GNinja \
175+
-DCMAKE_BUILD_TYPE=Debug \
176+
-DCMAKE_CXX_FLAGS_DEBUG="-Wall -Wextra -fexceptions" \
177+
-DWITH_LLVM=no \
178+
-DLPYTHON_BUILD_TO_WASM=yes \
179+
-DLFORTRAN_BUILD_ALL=yes \
180+
-DWITH_STACKTRACE=no \
181+
-DWITH_RUNTIME_STACKTRACE=no \
182+
-DCMAKE_PREFIX_PATH="$CONDA_PREFIX" \
183+
-DCMAKE_INSTALL_PREFIX=`pwd`/inst \
184+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
185+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
186+
187+
cmake --build . -j16 --target install
177188
178189
- name: Test built lpython.wasm
179190
shell: bash -l {0}
@@ -196,26 +207,30 @@ jobs:
196207
with:
197208
environment-file: ci/environment.yml
198209
create-args: >-
210+
python=3.10
199211
bison=3.4
200212
201213
- uses: hendrikmuhs/ccache-action@main
202214
with:
215+
variant: sccache
203216
key: ${{ github.job }}-${{ matrix.os }}
204217

205-
- name: Setup Platform (Linux)
206-
shell: bash -l {0}
207-
run: |
208-
echo "LFORTRAN_CMAKE_GENERATOR=Unix Makefiles" >> $GITHUB_ENV
209-
echo "WIN=0" >> $GITHUB_ENV
210-
echo "MACOS=0" >> $GITHUB_ENV
211-
echo "ENABLE_RUNTIME_STACKTRACE=yes" >> $GITHUB_ENV
212-
echo "CMAKE_C_COMPILER_LAUNCHER=ccache" >> $GITHUB_ENV
213-
echo "CMAKE_CXX_COMPILER_LAUNCHER=ccache" >> $GITHUB_ENV
214-
215218
- name: Build Linux
216219
shell: bash -l {0}
217220
run: |
218-
xonsh ci/build.xsh
221+
./build0.sh
222+
cmake . -GNinja \
223+
-DCMAKE_BUILD_TYPE=Debug \
224+
-DWITH_LLVM=yes \
225+
-DLFORTRAN_BUILD_ALL=yes \
226+
-DWITH_STACKTRACE=no \
227+
-DWITH_RUNTIME_STACKTRACE=yes \
228+
-DCMAKE_PREFIX_PATH="$CONDA_PREFIX" \
229+
-DCMAKE_INSTALL_PREFIX=`pwd`/inst \
230+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
231+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
232+
233+
cmake --build . -j16 --target install
219234
220235
- name: PIP show version
221236
shell: bash -l {0}

0 commit comments

Comments
 (0)