Skip to content

Commit 0ed1ce7

Browse files
committed
ci: rework web jobs
1 parent 1f48769 commit 0ed1ce7

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

ci/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,20 @@ help:
108108
@echo -e "\te.g. 'make toolchain_mips64_build'"
109109
@echo -e "\te.g. 'make toolchain_arm64_test'"
110110
@echo
111+
@echo -e "\tBuild for web using emscripten."
112+
@echo -e "\t${BOLD}web_<web_stage>${RESET}: build the emscripten <web_stage>."
113+
@echo -e "\t${BOLD}save_web_<web_stage>${RESET}: Save the <web_stage> docker image."
114+
@echo -e "\t${BOLD}sh_web_<web_stage>${RESET}: run a container using the <web_stage> docker image specified (debug purpose)."
115+
@echo -e "\t${BOLD}clean_web_<web_stage>${RESET}: Remove cache and docker image."
116+
@echo -e "\t${BOLD}clean_web${RESET}: Remove ALL cache and docker image."
117+
@echo
118+
@echo -e "\tWith ${BOLD}<web_stage>${RESET}:"
119+
@echo -e "\t\t${BOLD}env${RESET}"
120+
@echo -e "\t\t${BOLD}devel${RESET}"
121+
@echo -e "\t\t${BOLD}build${RESET}"
122+
@echo -e "\t\t${BOLD}test${RESET}"
123+
@echo -e "\te.g. 'make web_build'"
124+
@echo
111125
@echo -e "\tBuild using a vagrant machine."
112126
@echo -e "\t${BOLD}<vm>_<vms_stage>${RESET}: build the vagrant <vm> virtual machine."
113127
@echo -e "\t${BOLD}sh_<vm>_<lang>${RESET}: ssh to the vagrant machine specified (debug purpose)."

ci/docker/web/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Create a virtual environment with all tools installed
22
# ref: https://hub.docker.com/_/archlinux/
33
FROM archlinux:latest AS env
4+
45
# Install system build dependencies
56
ENV PATH=/usr/local/bin:$PATH
6-
RUN pacman -Syu --noconfirm git base-devel cmake
7+
RUN pacman -Syu --noconfirm git base-devel glibc cmake
8+
RUN cmake -version
79
RUN pacman -Syu --noconfirm nodejs emscripten
810
ENV PATH=/usr/lib/emscripten:$PATH
911
RUN emcc -v
@@ -14,9 +16,9 @@ WORKDIR /home/project
1416
COPY . .
1517

1618
FROM devel AS build
17-
RUN cmake --version
1819
RUN emcmake cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release
1920
RUN cmake --build build --target all -v
21+
#RUN cmake --build build --target install -v
2022

2123
FROM build AS test
2224
#RUN CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target test

0 commit comments

Comments
 (0)