diff --git a/ansi-colors.sh b/ansi-colors.sh index fce0a906dfddf78af141c9a143a0e1bf2b376e5d..2de4e1e239be205722613a19dd5815466303c291 100644 --- a/ansi-colors.sh +++ b/ansi-colors.sh @@ -2,12 +2,15 @@ DARKGRAY='0;30' RED='0;31' -LIGHTRED='1;31' +BOLDRED='1;31' GREEN='0;32' -YELLOW='1;33' +BOLDGREEN='1;32' +YELLOW='0;33' +BOLDYELLOW='1;33' BLUE='0;34' +BOLDBLUE='1;34' PURPLE='0;35' -LIGHTPURPLE='1;35' +BOLDPURPLE='1;35' CYAN='0;36' WHITE='1;37' diff --git a/buildjob b/buildjob index 3fbf96eba033076ce394288ee97b5b9ab89d1042..acc68685b6dd968c328cc1de708462cd533313d3 100755 --- a/buildjob +++ b/buildjob @@ -18,15 +18,15 @@ set -e env | egrep '^(CI_BUILD_REF|CI_RUNNER)' > build-env.txt # Build -echo_color "$GREEN" "[buildjob] Perfoming build" +echo_color "$BOLDGREEN" "[buildjob] Perfoming build" time make -k -j$CPU_CORES TIMED=y 2>&1 | tee build-log.txt if fgrep Axiom build-log.txt >/dev/null; then exit 1; fi -echo_color "$GREEN" "[buildjob] Build time summary" +echo_color "$BOLDGREEN" "[buildjob] Build time summary" cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt # maybe validate if [[ -n "$VALIDATE" ]]; then - echo_color "$GREEN" "[buildjob] Performing validation" + echo_color "$BOLDGREEN" "[buildjob] Performing validation" make validate; fi @@ -35,7 +35,7 @@ if [[ -z "$OPAM_PKG_BRANCH" ]]; then OPAM_PKG_BRANCH=master fi if [[ -n "$OPAM_PKG" && "$CI_COMMIT_REF_NAME" == "$OPAM_PKG_BRANCH" ]]; then - echo_color "$GREEN" "[buildjob] Releasing package on opam" + echo_color "$BOLDGREEN" "[buildjob] Releasing package on opam" # determine package name prefix if [[ "$CI_COMMIT_REF_NAME" == master ]]; then OPAM_PKG_PREFIX=dev diff --git a/prepare-opam.sh b/prepare-opam.sh index c7ad6e049d011ccc0132851aa0246d6db11af2ca..8c257f203d9e6c1a55cba9caa6606dd7a8f55d64 100644 --- a/prepare-opam.sh +++ b/prepare-opam.sh @@ -7,9 +7,9 @@ export OPAM_EDITOR="$(which false)" # Make sure we got a good OPAM. if test -d "$OPAMROOT"; then - echo_color "$GREEN" "[prepare-opam] Re-using cached opam root" + echo_color "$BOLDGREEN" "[prepare-opam] Re-using cached opam root" else - echo_color "$YELLOW" "[prepare-opam] Creating new opam root" + echo_color "$BOLDYELLOW" "[prepare-opam] Creating new opam root" mkdir "$OPAMROOT" opam init --no-setup -y fi @@ -39,7 +39,7 @@ echo # that is not currently possible. # Install fixed versions of some dependencies. -echo_color "$GREEN" "[prepare-opam] Processing pins" +echo_color "$BOLDGREEN" "[prepare-opam] Processing pins" while (( "$#" )); do # while there are arguments left PACKAGE="$1" ; shift KIND="$1" ; shift @@ -48,21 +48,21 @@ while (( "$#" )); do # while there are arguments left # Check if the pin is already set read -a PIN <<< $(opam pin list | (egrep "^$PACKAGE[. ]")) if [[ "${PIN[1]}" == "$KIND" && "${PIN[2]}" == "$VERSION" ]]; then - echo_color "$GREEN" "[prepare-opam] $PACKAGE already $KIND-pinned to $VERSION" + echo_color "$BOLDGREEN" "[prepare-opam] $PACKAGE already $KIND-pinned to $VERSION" else - echo_color "$YELLOW" "[prepare-opam] $KIND-pinning $PACKAGE to $VERSION" + echo_color "$BOLDYELLOW" "[prepare-opam] $KIND-pinning $PACKAGE to $VERSION" opam pin add -y -k "$KIND" "$PACKAGE" "$VERSION" fi done echo # Upgrade cached things. -echo_color "$GREEN" "[prepare-opam] Upgrading opam" +echo_color "$BOLDGREEN" "[prepare-opam] Upgrading opam" opam upgrade -y --fixup && opam upgrade -y echo # Install build-dependencies. -echo_color "$GREEN" "[prepare-opam] Installing build-dependencies" +echo_color "$BOLDGREEN" "[prepare-opam] Installing build-dependencies" make build-dep OPAMFLAGS=-y echo