From e506f77e8f6ddeb3e114a3b7e3ce5f114192d801 Mon Sep 17 00:00:00 2001 From: 1138-4EB <1138-4EB@users.noreply.github.com> Date: Thu, 21 Nov 2019 17:39:24 +0000 Subject: Actions: add workflow 'push' (#1016) * use CC=clang to build C sources on macOS * actions: ensure that shared libs are in the PATH on windows * ci: add GitHub Actions 'push' workflow * ci: fix group labels * dist: add GRAY to ansi_color * ci: use same scripts for GHA and Travis --- dist/ansi_color.sh | 1 + dist/ci-run.sh | 476 ++++++++++++++++++++++++++++++++++++++++ dist/man.sh | 15 ++ dist/msys2-mingw/llvm/PKGBUILD | 28 +++ dist/msys2-mingw/mcode/PKGBUILD | 28 +++ dist/msys2-mingw/run.sh | 123 +++++++++++ dist/travis/build.sh | 167 -------------- dist/travis/man.sh | 13 -- dist/travis/travis-ci.sh | 110 ---------- dist/travis/utils.sh | 107 --------- 10 files changed, 671 insertions(+), 397 deletions(-) create mode 100755 dist/ci-run.sh create mode 100755 dist/man.sh create mode 100644 dist/msys2-mingw/llvm/PKGBUILD create mode 100644 dist/msys2-mingw/mcode/PKGBUILD create mode 100644 dist/msys2-mingw/run.sh delete mode 100755 dist/travis/build.sh delete mode 100755 dist/travis/man.sh delete mode 100755 dist/travis/travis-ci.sh delete mode 100644 dist/travis/utils.sh (limited to 'dist') diff --git a/dist/ansi_color.sh b/dist/ansi_color.sh index 6b81229c5..bb5c348bc 100644 --- a/dist/ansi_color.sh +++ b/dist/ansi_color.sh @@ -7,6 +7,7 @@ enable_color() { ANSI_YELLOW="\033[33m" ANSI_BLUE="\033[34m" ANSI_MAGENTA="\033[35m" + ANSI_GRAY="\033[90m" ANSI_CYAN="\033[36;1m" ANSI_DARKCYAN="\033[36m" ANSI_NOCOLOR="\033[0m" diff --git a/dist/ci-run.sh b/dist/ci-run.sh new file mode 100755 index 000000000..d6061edb2 --- /dev/null +++ b/dist/ci-run.sh @@ -0,0 +1,476 @@ +#! /bin/bash + +scriptdir=`dirname $0` + +if [ -n "$GITHUB_EVENT_PATH" ]; then + export CI=true +fi + +. "$scriptdir/ansi_color.sh" +disable_color + +print_start() { + COL="$ANSI_YELLOW" + if [ "x$2" != "x" ]; then + COL="$2" + fi + printf "${COL}${1}$ANSI_NOCOLOR\n" +} + +gstart () { + print_start "$@" +} +gend () { + : +} + +if [ -n "$TRAVIS" ]; then + echo "INFO: set 'gstart' and 'gend' for TRAVIS" + # This is a trimmed down copy of https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/bash/* + travis_time_start() { + # `date +%N` returns the date in nanoseconds. It is used as a replacement for $RANDOM, which is only available in bash. + travis_timer_id=`date +%N` + travis_start_time=`travis_nanoseconds` + echo "travis_time:start:$travis_timer_id" + } + travis_time_finish() { + travis_end_time=`travis_nanoseconds` + local duration=$(($travis_end_time-$travis_start_time)) + echo "travis_time:end:$travis_timer_id:start=$travis_start_time,finish=$travis_end_time,duration=$duration" + } + + if [ "$TRAVIS_OS_NAME" = "osx" ]; then + travis_nanoseconds() { + date -u '+%s000000000' + } + else + travis_nanoseconds() { + date -u '+%s%N' + } + fi + + gstart () { + echo "travis_fold:start:group" + travis_time_start + print_start "$@" + } + + gend () { + travis_time_finish + echo "travis_fold:end:group" + } +else + if [ -n "$CI" ]; then + echo "INFO: set 'gstart' and 'gend' for CI" + gstart () { + printf '::group::' + print_start "$@" + SECONDS=0 + } + + gend () { + duration=$SECONDS + echo '::endgroup::' + printf "${ANSI_GRAY}took $(($duration / 60)) min $(($duration % 60)) sec.${ANSI_NOCOLOR}\n" + } + fi +fi + +echo "cliargs: $0 $@" + +# Stop in case of error +set -e + +ISGPL=false +ISSYNTH=false + +# Transform long options to short ones +for arg in "$@"; do + shift + case "$arg" in + "--color"|"-color") set -- "$@" "-c";; + "--backend"|"-backend") set -- "$@" "-b";; + "--pkg"|"-pkg") set -- "$@" "-p";; + "--gpl"|"-gpl") set -- "$@" "-g";; + "--synth"|"-synth") set -- "$@" "-s";; + *) set -- "$@" "$arg" + esac +done +# Parse args +while getopts ":b:p:cgs" opt; do + case $opt in + c) enable_color;; + b) BACK=$OPTARG ;; + p) PKG_NAME=$OPTARG;; + g) ISGPL=true;; + s) ISSYNTH=true;; + \?) printf "$ANSI_RED[CI - args] Invalid option: -$OPTARG $ANSI_NOCOLOR\n" >&2 + exit 1 ;; + :) printf "$ANSI_RED[CI - args] Option -$OPTARG requires an argument. $ANSI_NOCOLOR\n" >&2 + exit 1 ;; + esac +done +shift $((OPTIND -1)) + +#--- + +# +# Build command options +# + +notag() { + # No tag: use date + commit id + echo "`git log -1 --date=short --pretty=format:%cd | sed 's/-//g'`-$PKG_SHA" +} + +vertag() { + if expr "$1" : 'v[0-9].*' > /dev/null; then + # Remove leading 'v' in tags in the filenames. + echo $1 | cut -c2- + # Check version defined in configure. + if [ "x$1" != "x`grep "^ghdl_version=" configure | sed -e 's/.*"\(.*\)";/\1/'`" ]; then + printf "${ANSI_RED}Tag '$1' does not match 'ghdl_version'!${ANSI_NOCOLOR}\n" 1>&2; + exit 1 + fi + else + # Regular tag (like snapshots), nothing to change. + echo "$2" + fi +} + +buildCmdOpts () { + BUILD_ARG="$1" + + # Get short commit SHA + if [ -n "$TRAVIS_COMMIT" ]; then + GIT_SHA="$TRAVIS_COMMIT" + fi + if [ -n "$GITHUB_SHA" ]; then + GIT_SHA="$GITHUB_SHA" + fi + if [ -z "$GIT_SHA" ]; then + GIT_SHA="`git rev-parse --verify HEAD`" + fi + PKG_SHA="`printf $GIT_SHA | cut -c1-10`" + + echo "TRAVIS_COMMIT: $TRAVIS_COMMIT" + echo "TRAVIS_TAG: $TRAVIS_TAG" + echo "GITHUB_SHA: $GITHUB_SHA" + echo "GITHUB_REF: $GITHUB_REF" + echo "GIT_SHA: $GIT_SHA" + + # Compute package name + case "$GITHUB_REF" in + *tags*) + PKG_TAG="$(vertag "`echo "$GITHUB_REF" | sed 's#^refs/tags/\(.*\)#\1#g'`" "$GITHUB_REF")" + ;; + *heads*|*pull*) + PKG_TAG="`notag`" + ;; + "") + if [ -z "$TRAVIS_TAG" ]; then + PKG_TAG="`notag`" + else + PKG_TAG="`vertag "$TRAVIS_TAG" "$TRAVIS_TAG"`" + fi + ;; + *) + PKG_TAG="$GITHUB_REF" + ;; + esac + + echo "PKG_SHA: $PKG_SHA" + echo "PKG_TAG: $PKG_TAG" + + # Extract from BUILD_ARG + IFS='+' read -ra REFS <<< "$BUILD_ARG" + DDIST=${REFS[0]} # Linux distro (eg: ubuntuXX, fedoraXX) + DBACK=${REFS[1]} # Build/backend (eg: mcode, llvm) + + PKG_NAME="ghdl-${PKG_TAG}-${DDIST}-${DBACK}" + BUILD_CMD_OPTS="$ENABLECOLOR -b $DBACK" + + if [ "x$ISGPL" = "xtrue" ]; then + BUILD_CMD_OPTS="$BUILD_CMD_OPTS --gpl" + PKG_NAME="${PKG_NAME}-gpl" + DEXT="-gpl" + fi + if [ "x$ISSYNTH" = "xtrue" ]; then + BUILD_CMD_OPTS="$BUILD_CMD_OPTS --synth" + PKG_NAME="${PKG_NAME}-synth" + DEXT="-synth" + fi + export BUILD_CMD_OPTS="${BUILD_CMD_OPTS} -p $PKG_NAME" + + GHDL_IMAGE_TAG="`echo $BUILD_ARG | sed -e 's/+/-/g'`" + BUILD_IMAGE_TAG="$GHDL_IMAGE_TAG" + + case $BUILD_ARG in + *gcc*) + BUILD_IMAGE_TAG="`echo $GHDL_IMAGE_TAG | sed 's#\(.*\)-gcc.*#\1-gcc#g'`" + ;; + esac + + GHDL_IMAGE_TAG="${GHDL_IMAGE_TAG}$DEXT" +} + +run_cmd() { + echo "$@" + "$@" +} + +# +# Build ghdl +# + +build () { + rm -f build_ok + + #--- Env + + gstart "[GHDL - build] Environment" + env + gend + + #--- GPL: gpl-ize sources + + if [ "$ISGPL" = "true" ]; then + GPLDIR="${PKG_NAME}.src" + gstart "[GHDL - build] create GPL source package (${ANSI_CYAN}${GPLDIR}.tgz${ANSI_NOCOLOR})" + files=`echo *` + make -f Makefile.in srcdir=. clean-pure-gpl + mkdir "$GPLDIR" + cp -pdrl $files "$GPLDIR" + tar -zcf "${GPLDIR}.tgz" "$GPLDIR" + gend + fi + + #--- Configure + + CDIR=`pwd` + export prefix="$CDIR/install-$BACK" + mkdir "$prefix" + mkdir "build-$BACK" + cd "build-$BACK" + + if [ "x$ISSYNTH" = "xtrue" ]; then + CONFIG_OPTS+=" --enable-synth" + fi + + case "$BACK" in + gcc*) + gstart "[GHDL - build] Get gcc sources" + echo "https://github.com/gcc-mirror/gcc/archive/`echo ${BACK} | sed -e 's/\./_/g'`-release.tar.gz" + mkdir gcc-srcs + curl -L "https://github.com/gcc-mirror/gcc/archive/`echo ${BACK} | sed -e 's/\./_/g'`-release.tar.gz" | tar -xz -C gcc-srcs --strip-components=1 + cd gcc-srcs + sed -i.bak s/ftp:/http:/g ./contrib/download_prerequisites + ./contrib/download_prerequisites + cd .. + gend + + gstart "[GHDL - build] Configure ghdl" + run_cmd ../configure --with-gcc=gcc-srcs --prefix="$prefix" $CONFIG_OPTS + gend + gstart "[GHDL - build] Copy sources" + make copy-sources + mkdir gcc-objs; cd gcc-objs + gend + gstart "[GHDL - build] Configure gcc" + run_cmd ../gcc-srcs/configure --prefix="$prefix" --enable-languages=c,vhdl --disable-bootstrap --disable-lto --disable-multilib --disable-libssp --disable-libgomp --disable-libquadmath "`gcc -v 2>&1 | grep -o -- --enable-default-pie`" + gend + ;; + mcode) + CXX="" + ;; + llvm) + CXX="clang" + CONFIG_OPTS+=" --with-llvm-config CXX=$CXX" + ;; + llvm-3.5) + CXX="clang++" + CONFIG_OPTS+=" --with-llvm-config=llvm-config-3.5 CXX=$CXX" + ;; + llvm-*) + llvmver=`echo $BACK | sed -e "s/llvm-//"` + CXX="clang++-$llvmver" + CONFIG_OPTS+=" --with-llvm-config=llvm-config-$llvmver CXX=$CXX" + ;; + *) + printf "$ANSI_RED[GHDL - build] Unknown build $BACK $ANSI_NOCOLOR\n" + exit 1;; + esac + + if [ ! "`echo $BACK | grep gcc`" ]; then + gstart "[GHDL - build] Configure" + run_cmd ../configure "--prefix=$prefix" $CONFIG_OPTS + gend + fi + + #--- make + + gstart "[GHDL - build] Make" + set +e + make LIB_CFLAGS="$LIB_CFLAGS" OPT_FLAGS="$OPT_FLAGS" -j`nproc` 2>make_err.log + tail -1000 make_err.log + set -e + gend + + gstart "[GHDL - build] Install" + make install + cd .. + gend + + if [ "`echo $BACK | grep gcc`" ]; then + gstart "[GHDL - build] Make ghdllib" + make ghdllib + gend + + gstart "[GHDL - build] Install ghdllib" + make install + cd .. + gend + fi + + #--- package + + gstart "[GHDL - build] Create package ${ANSI_DARKCYAN}${PKG_NAME}.tgz" + tar -zcvf "${PKG_NAME}.tgz" -C "$prefix" . + gend + + #--- build tools versions + + { + make --version | grep 'Make' + gnatls --version | grep 'GNATLS' + gcc --version | grep 'gcc' + if [ "$CXX" != "" ]; then + $CXX --version | grep 'clang' + fi + } > BUILD_TOOLS + + #--- + + printf "$ANSI_GREEN[GHDL - build] SUCCESSFUL${ANSI_NOCOLOR}\n" + touch build_ok +} + +# +# Build ghdl/ghdl image +# + +build_img_ghdl() { + gstart "[DOCKER - build] ghdl/ghdl:${GHDL_IMAGE_TAG}" "$ANSI_BLUE" + docker build -t ghdl/ghdl:$GHDL_IMAGE_TAG . -f-<&2 - exit 1 ;; - :) printf "$ANSI_RED[GHDL - build] Option -$OPTARG requires an argument. $ANSI_NOCOLOR\n" >&2 - exit 1 ;; - esac -done - -rm -f build_ok - -#--- Env - -travis_start "env.docker" "$ANSI_YELLOW[Info] Environment $ANSI_NOCOLOR" -env -travis_finish "env.docker" - -#--- GPL: gpl-ize sources - -if [ "$ISGPL" = "true" ]; then - travis_start "gpl.src" "$ANSI_YELLOW[Source] create GPL sources $ANSI_NOCOLOR" - files=`echo *` - make -f Makefile.in srcdir=. clean-pure-gpl - mkdir ${PKG_NAME} - cp -pdrl $files ${PKG_NAME} - tar -zcf "${PKG_NAME}.tar.gz" ${PKG_NAME} - PKG_NAME="${PKG_NAME}-${BLD}" - travis_finish "gpl.src" -fi - -#--- Configure - -travis_start "configure" "$ANSI_YELLOW[GHDL - build] Configure $ANSI_NOCOLOR" -notime - -CDIR=$(pwd) -export prefix="$CDIR/install-$BLD" -mkdir "$prefix" -mkdir "build-$BLD" -cd "build-$BLD" - -if [ "x$ISSYNTH" = "xtrue" ]; then - CONFIG_OPTS+=" --enable-synth" -fi - -case "$BLD" in - gcc*) - travis_start "get_gcc" "$ANSI_YELLOW[GHDL] Get gcc sources $ANSI_NOCOLOR" - echo "https://github.com/gcc-mirror/gcc/archive/$(echo ${BLD} | sed -e 's/\./_/g')-release.tar.gz" - mkdir gcc-srcs - curl -L "https://github.com/gcc-mirror/gcc/archive/$(echo ${BLD} | sed -e 's/\./_/g')-release.tar.gz" | tar -xz -C gcc-srcs --strip-components=1 - cd gcc-srcs - sed -i.bak s/ftp:/http:/g ./contrib/download_prerequisites - ./contrib/download_prerequisites - cd .. - travis_finish "get_gcc" - - travis_start "configure_gcc" "$ANSI_YELLOW[GHDL] Configure gcc $ANSI_NOCOLOR" - ../configure --with-gcc=gcc-srcs --prefix="$prefix" - make copy-sources - mkdir gcc-objs; cd gcc-objs - ../gcc-srcs/configure --prefix="$prefix" --enable-languages=c,vhdl --disable-bootstrap --disable-lto --disable-multilib --disable-libssp --disable-libgomp --disable-libquadmath "`gcc -v 2>&1 | grep -o -- --enable-default-pie`" - travis_finish "configure_gcc" - ;; - mcode) - CXX="" - ;; - llvm) - CXX="clang" - CONFIG_OPTS+=" --with-llvm-config CXX=$CXX" - ;; - llvm-3.5) - CXX="clang++" - CONFIG_OPTS+=" --with-llvm-config=llvm-config-3.5 CXX=$CXX" - ;; - llvm-*) - llvmver=$(echo $BLD | sed -e "s/llvm-//") - CXX="clang++-$llvmver" - CONFIG_OPTS+=" --with-llvm-config=llvm-config-$llvmver CXX=$CXX" - ;; - *) - echo "$ANSI_RED[GHDL - build] Unknown build $BLD $ANSI_NOCOLOR" - exit 1;; -esac - -if [ ! "$(echo $BLD | grep gcc)" ]; then - echo "../configure --prefix=$prefix $CONFIG_OPTS" - ../configure "--prefix=$prefix" $CONFIG_OPTS -fi - -travis_finish "configure" -notime - -#--- make - -travis_start "make" "$ANSI_YELLOW[GHDL - build] Make $ANSI_NOCOLOR" -set +e -make LIB_CFLAGS="$LIB_CFLAGS" OPT_FLAGS="$OPT_FLAGS" -j$(nproc) 2>make_err.log -tail -1000 make_err.log -set -e -travis_finish "make" - -travis_start "install" "$ANSI_YELLOW[GHDL - build] Install $ANSI_NOCOLOR" -make install -cd .. -travis_finish "install" - -if [ "$(echo $BLD | grep gcc)" ]; then - travis_start "make_ghdllib" "$ANSI_YELLOW[GHDL - build] Make ghdllib $ANSI_NOCOLOR" - make ghdllib - travis_finish "make_ghdllib" - - travis_start "install_ghdllib" "$ANSI_YELLOW[GHDL - build] Install ghdllib $ANSI_NOCOLOR" - make install - cd .. - travis_finish "install_ghdllib" -fi - -#--- package - -travis_start "tar.bin" "$ANSI_YELLOW[GHDL - build] Create package ${ANSI_DARKCYAN}${PKG_NAME}.tgz $ANSI_NOCOLOR" -tar -zcvf "${PKG_NAME}.tgz" -C "$prefix" . -travis_finish "tar.bin" - -#--- build tools versions - -{ - make --version | grep 'Make' - gnatls --version | grep 'GNATLS' - gcc --version | grep 'gcc' - if [ "$CXX" != "" ]; then - $CXX --version | grep 'clang' - fi -} > BUILD_TOOLS - -#--- - -echo "[SUCCESSFUL]" -touch build_ok diff --git a/dist/travis/man.sh b/dist/travis/man.sh deleted file mode 100755 index ab00cb4c9..000000000 --- a/dist/travis/man.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/bash - -rm -rf doc/_build/man/* - -set -e - -docker run --rm -it \ - -v /$(pwd):/src \ - -w //src/doc \ - btdi/sphinx:py2-featured \ - sh -c "sphinx-build -T -b man . ./_build/man" - -nroff -man doc/_build/man/ghdl.1 diff --git a/dist/travis/travis-ci.sh b/dist/travis/travis-ci.sh deleted file mode 100755 index 676d9dcf2..000000000 --- a/dist/travis/travis-ci.sh +++ /dev/null @@ -1,110 +0,0 @@ -#! /bin/bash -# This script is executed in the travis-ci environment. - -build_img_ghdl() { - travis_start "build_run" "$ANSI_BLUE[DOCKER build] ghdl/ghdl:${GHDL_IMAGE_TAG}$ANSI_NOCOLOR" - docker build -t ghdl/ghdl:$GHDL_IMAGE_TAG . -f-< /dev/null; then - # Remove leading 'v' in tags in the filenames. - PKG_TAG="$(echo $TRAVIS_TAG | cut -c2-)" - else - # Regular tag (like snapshots), nothing to change. - PKG_TAG="$TRAVIS_TAG" - fi - - # Extract from BUILD_ARG - IFS='+' read -ra REFS <<< "$BUILD_ARG" - DDIST=${REFS[0]} # Linux distro (eg: ubuntuXX, fedoraXX) - DBLD=${REFS[1]} # Build/backend (eg: mcode, llvm) - DEXT=${REFS[2]} # Extra constraints: GPL, synth - - PKG_NAME="ghdl-${PKG_TAG}-${DDIST}-${DBLD}" - BUILD_CMD_OPTS="$ENABLECOLOR -b $DBLD" - - if [ "x$DEXT" = "xgpl" ]; then - BUILD_CMD_OPTS="$BUILD_CMD_OPTS --gpl" - PKG_NAME="ghdl-$DEXT-${PKG_TAG}" - fi - if [ "x$DEXT" = "xsynth" ]; then - BUILD_CMD_OPTS="$BUILD_CMD_OPTS --synth" - PKG_NAME="ghdl-$DEXT-${PKG_TAG}" - fi - export BUILD_CMD_OPTS="${BUILD_CMD_OPTS} -p $PKG_NAME" - - GHDL_IMAGE_TAG="`echo $IMAGE | sed -e 's/+/-/g'`" - BUILD_IMAGE_TAG="$GHDL_IMAGE_TAG" - - case $BUILD_ARG in - *gcc*) - BUILD_IMAGE_TAG="`echo $GHDL_IMAGE_TAG | sed 's#\(.*\)-gcc.*#\1-gcc#g'`" - ;; - esac - - if [ "x$DEXT" != "x" ]; then - GHDL_IMAGE_TAG="$GHDL_IMAGE_TAG-$DEXT" - fi -} - -#-- - -. "$scriptdir/../ansi_color.sh" -#disable_color -- cgit v1.2.3