git.iko.soy/project-m36
on master help sign in
sixth try to trasiv-ci
e632331Hugh JF Chen
DevOps/local/test/prepare.sh−2
compare with master
unifiedsplit
@@ -21,8 +21,6 @@ case ${THE_DISTRIBUTION_ID} in
21 fi
21 fi
22 ;;
22 ;;
23 ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
23 ubuntu) if [ "${THE_DISTRIBUTION_VERSION}" != "16.04" ] && [ "${THE_DISTRIBUTION_VERSION}" != "18.04" ]; then
24− echo ${THE_DISTRIBUTION_VERSION}
25− cat /etc/os-release
26 my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
24 my_exit "This CI/CD script only supports ubuntu 16.04 and 18.04, will abort" 1
27 fi
25 fi
28 ;;
26 ;;
ci/DevOps/local/test/build/build.sh+1−1
@@ -21,7 +21,7 @@ if [ -f ${SCRIPT_ABS_PATH}/nix/project-m36.nix ]; then
21 [ -x ~/.emacs.d/bin/doom ] && echo "((nil . ((dante-target . \"project-m36\"))))" > ${SCRIPT_ABS_PATH}/../../../../.dir-locals.el && nix-shell --run "~/.emacs.d/bin/doom env > /dev/null 2>&1" ${SCRIPT_ABS_PATH}/nix/shell.nix
21 [ -x ~/.emacs.d/bin/doom ] && echo "((nil . ((dante-target . \"project-m36\"))))" > ${SCRIPT_ABS_PATH}/../../../../.dir-locals.el && nix-shell --run "~/.emacs.d/bin/doom env > /dev/null 2>&1" ${SCRIPT_ABS_PATH}/nix/shell.nix
22 nix-shell ${SCRIPT_ABS_PATH}/nix/shell.nix
22 nix-shell ${SCRIPT_ABS_PATH}/nix/shell.nix
23 else
23 else
24− nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean ; cabal new-test" ${SCRIPT_ABS_PATH}/nix/shell.nix
24+ nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-update ; cabal new-clean ; cabal new-test" ${SCRIPT_ABS_PATH}/nix/shell.nix
25 nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean" ${SCRIPT_ABS_PATH}/nix/shell.nix
25 nix-shell --run "cd ${SCRIPT_ABS_PATH}/../../../../.. ; cabal new-clean" ${SCRIPT_ABS_PATH}/nix/shell.nix
26 nix-build -A project-m36-docker ${SCRIPT_ABS_PATH}/nix/default.nix
26 nix-build -A project-m36-docker ${SCRIPT_ABS_PATH}/nix/default.nix
27 fi
27 fi