From e41d872be90744e9c8efd890e163f09f1d7c8c01 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Wed, 14 Sep 2022 10:23:28 +0200 Subject: [PATCH] CI: fix macOS build --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22a2411f..32f1f049 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,8 +7,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] - #os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-latest] runs-on: ${{matrix.os}} @@ -45,10 +44,9 @@ jobs: if: startsWith(matrix.os, 'macos') run: | brew install opencascade - GH_CASCADE_BASE_DIR=`brew --cellar opencascade` - GH_CASCADE_VERSION=`brew info opencascade | grep -E --only-matching --max-count=1 "[0-9]\.[0-9]\.[0-9]"` - echo "GH_CASCADE_INC_DIR=$GH_CASCADE_BASE_DIR/$GH_CASCADE_VERSION/include/opencascade" >> $GITHUB_ENV - echo "GH_CASCADE_LIB_DIR=$GH_CASCADE_BASE_DIR/$GH_CASCADE_VERSION/lib" >> $GITHUB_ENV + GH_CASCADE_BASE_DIR=`brew info opencascade | grep -E -i --only-matching --max-count=1 "^(/[a-z\.\-_0-9]+)+"` + echo "GH_CASCADE_INC_DIR=$GH_CASCADE_BASE_DIR/include/opencascade" >> $GITHUB_ENV + echo "GH_CASCADE_LIB_DIR=$GH_CASCADE_BASE_DIR/lib" >> $GITHUB_ENV - name: Get count of CPU cores uses: SimenB/github-actions-cpu-cores@v1 @@ -62,6 +60,8 @@ jobs: run: | echo CASCADE_INC_DIR=${{env.GH_CASCADE_INC_DIR}} echo CASCADE_LIB_DIR=${{env.GH_CASCADE_LIB_DIR}} + [ ! -d $CASCADE_INC_DIR ] && echo "ERROR: OpenCascade include dir doesn't exist" + [ ! -d $CASCADE_LIB_DIR ] && echo "ERROR: OpenCascade lib dir doesn't exist" qmake ../source CASCADE_INC_DIR=${{env.GH_CASCADE_INC_DIR}} CASCADE_LIB_DIR=${{env.GH_CASCADE_LIB_DIR}} CONFIG+=withtests - name: Build