diff options
| author | Cheng Shao <terrorjack@type.dance> | 2023-01-09 12:56:05 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2023-01-13 11:06:58 +0000 |
| commit | d31fcbca6cf4bc166904cfd25696503401ad631d (patch) | |
| tree | 820cffab7493c216b8cf56043f1bb1af7bb9cfbd | |
| parent | d53598c5b71521d6706fc0f4b5713110195d5578 (diff) | |
| download | haskell-d31fcbca6cf4bc166904cfd25696503401ad631d.tar.gz | |
ci: use in-image emsdk for js jobs
| -rwxr-xr-x | .gitlab/ci.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index 6500c6923c..13d6f71331 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -252,11 +252,6 @@ function setup() { cp -Rf "$CABAL_CACHE"/* "$CABAL_DIR" fi - case "${CONFIGURE_WRAPPER:-}" in - emconfigure) time_it "setup" setup_emscripten ;; - *) ;; - esac - case $toolchain_source in extracted) time_it "setup" setup_toolchain ;; *) ;; @@ -372,14 +367,6 @@ function setup_toolchain() { $cabal_install alex --constraint="alex>=$MIN_ALEX_VERSION" } -function setup_emscripten() { - git clone https://github.com/emscripten-core/emsdk.git - cd emsdk - ./emsdk install latest - ./emsdk activate latest - cd .. -} - function cleanup_submodules() { start_section "clean submodules" if [ -d .git ]; then @@ -418,7 +405,7 @@ EOF function configure() { case "${CONFIGURE_WRAPPER:-}" in - emconfigure) source emsdk/emsdk_env.sh ;; + emconfigure) source "$EMSDK/emsdk_env.sh" ;; *) ;; esac @@ -556,7 +543,7 @@ function make_install_destdir() { # install the binary distribution in directory $1 to $2. function install_bindist() { case "${CONFIGURE_WRAPPER:-}" in - emconfigure) source emsdk/emsdk_env.sh ;; + emconfigure) source "$EMSDK/emsdk_env.sh" ;; *) ;; esac |