diff options
| author | eine <6628437+eine@users.noreply.github.com> | 2020-03-01 20:53:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-01 20:53:18 +0100 |
| commit | 5cf513ac1a4f6ef61ee8c4312e3567ab2a49e96f (patch) | |
| tree | 7c1e496a1585401565accdbf59b4e16a84a5fd0e | |
| parent | a423981be5f226cd70429169c484814b2fd64752 (diff) | |
| download | ghdl-5cf513ac1a4f6ef61ee8c4312e3567ab2a49e96f.tar.gz ghdl-5cf513ac1a4f6ef61ee8c4312e3567ab2a49e96f.tar.bz2 ghdl-5cf513ac1a4f6ef61ee8c4312e3567ab2a49e96f.zip | |
enable synth by default (#1102)
* enable synth by default
* ci: disable synth for the GPL builds
* deprecate Ubuntu 16, use Ubuntu 18 in Travis
| -rw-r--r-- | .github/workflows/push.yml | 22 | ||||
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rwxr-xr-x | dist/ci-run.sh | 23 |
4 files changed, 26 insertions, 29 deletions
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e250ff1d2..84c26a756 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,24 +7,28 @@ env: jobs: + gpl: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: | + TASK=buster+mcode ./dist/ci-run.sh -c --gpl --no-synth + linux: strategy: fail-fast: false - max-parallel: 2 + max-parallel: 3 matrix: task: [ - { backend: mcode, args: "--gpl" }, - { backend: mcode, args: "--synth" }, - { backend: llvm-7, args: "--synth" }, - { backend: gcc-8.3.0, args: "--synth" }, + { backend: mcode, args: "" }, + { backend: llvm-7, args: "" }, + { backend: gcc-8.3.0, args: "" }, ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - run: ./dist/ci-run.sh -c $TARGS - env: - TASK: buster+${{ matrix.task.backend }} - TARGS: ${{ matrix.task.args }} + - run: | + TASK=buster+${{ matrix.task.backend }} ./dist/ci-run.sh -c osx: runs-on: macOS-latest diff --git a/.travis.yml b/.travis.yml index 2ba50e615..19f673f97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,9 @@ env: matrix: - TASK=buster+mcode - TASK=buster+mcode - TARGS=--gpl - - TASK=buster+mcode - TARGS=--synth - - TASK=ubuntu16+mcode - - TASK=ubuntu16+llvm-3.9 + TARGS="--gpl --no-synth" + - TASK=ubuntu18+mcode + - TASK=ubuntu18+llvm-5.0 - TASK=fedora31+mcode - TASK=fedora31+llvm @@ -45,7 +45,7 @@ enable_werror=true enable_checks=true enable_openieee=unknown enable_libghdl=true -enable_synth=false +enable_synth=true default_pic=false EXEEXT= SOEXT=.so diff --git a/dist/ci-run.sh b/dist/ci-run.sh index 3edf1e32b..fa0d61f2e 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -82,17 +82,17 @@ echo "cliargs: $0 $@" set -e ISGPL=false -ISSYNTH=false +ISSYNTH=true # 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";; + "--color"|"-color") set -- "$@" "-c";; + "--backend"|"-backend") set -- "$@" "-b";; + "--pkg"|"-pkg") set -- "$@" "-p";; + "--gpl"|"-gpl") set -- "$@" "-g";; + "--no-synth"|"-no-synth") set -- "$@" "-s";; *) set -- "$@" "$arg" esac done @@ -103,7 +103,7 @@ while getopts ":b:p:cgs" opt; do b) BACK=$OPTARG ;; p) PKG_NAME=$OPTARG;; g) ISGPL=true;; - s) ISSYNTH=true;; + s) ISSYNTH=false;; \?) 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 @@ -196,11 +196,6 @@ buildCmdOpts () { 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'`" @@ -254,8 +249,8 @@ build () { mkdir "build-$BACK" cd "build-$BACK" - if [ "x$ISSYNTH" = "xtrue" ]; then - CONFIG_OPTS+=" --enable-synth" + if [ "x$ISSYNTH" = "xfalse" ]; then + CONFIG_OPTS+=" --disable-synth" fi case "$BACK" in |