diff options
| -rw-r--r-- | .github/workflows/Test.yml | 7 | ||||
| -rwxr-xr-x | scripts/ci-run.sh | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 1fa176474..c98bfd2b9 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -158,10 +158,9 @@ jobs: fail-fast: false max-parallel: 2 matrix: - include: [ - { backend: mcode }, - { backend: brew-llvm } - ] + backend: + - mcode + - llvm runs-on: macOS-latest name: '๐ macOS ยท ${{ matrix.backend }}' steps: diff --git a/scripts/ci-run.sh b/scripts/ci-run.sh index d6bbbd8cd..2c53351a8 100755 --- a/scripts/ci-run.sh +++ b/scripts/ci-run.sh @@ -294,11 +294,6 @@ build () { CXX="clang++-$llvmver" CONFIG_OPTS+=" --with-llvm-config=llvm-config-$llvmver CXX=$CXX" ;; - brew-llvm) - llvmprefix=`brew --prefix llvm` - CXX="clang++" - CONFIG_OPTS+=" --with-llvm-config=$llvmprefix/bin/llvm-config CXX=$CXX" - ;; *) printf "$ANSI_RED[GHDL - build] Unknown build $BACK $ANSI_NOCOLOR\n" exit 1;; @@ -401,7 +396,8 @@ ci_run () { RUN="docker run --rm -t -e CI -e TRAVIS -v `pwd`:/work -w /work" if [ "x$IS_MACOS" = "xtrue" ]; then - export CPATH="$CPATH:`xcrun --show-sdk-path`/usr/include" + export CPATH="$CPATH:$(xcrun --show-sdk-path)/usr/include" + export PATH="$PATH:$(brew --prefix llvm)/bin" CC=clang bash -c "${scriptdir}/ci-run.sh $BUILD_CMD_OPTS build" else # Assume linux @@ -429,8 +425,8 @@ ci_run () { if [ "x$IS_MACOS" = "xtrue" ]; then CC=clang \ - prefix="`pwd`/install-$BACK/usr/local" \ - ./testsuite/testsuite.sh sanity gna vests vpi + prefix="$(pwd)/install-$(echo "$TASK" | cut -d+ -f2)/usr/local" \ + ./testsuite/testsuite.sh sanity gna vests vpi synth else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl |