diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-03-04 15:55:55 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-03-04 20:27:59 +0200 |
| commit | 1236b1500a44dab163f1fdb6a12f9678812e9fe8 (patch) | |
| tree | 1f2da24f555dc4951dcf32f97f65f8a73d2ff8db /.github | |
| parent | 91e30fadc797d1202fe49f873b27d17174398686 (diff) | |
| download | meson-1236b1500a44dab163f1fdb6a12f9678812e9fe8.zip meson-1236b1500a44dab163f1fdb6a12f9678812e9fe8.tar.gz meson-1236b1500a44dab163f1fdb6a12f9678812e9fe8.tar.bz2 | |
ci: Downgrade Qt on MacOS from Qt6 to Qt5
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/macos.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 25eac28..faff3ae 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -25,7 +25,7 @@ jobs: - run: | python -m pip install --upgrade pip python -m pip install pytest pytest-xdist jsonschema - - run: brew install pkg-config ninja llvm qt + - run: brew install pkg-config ninja llvm qt@5 - env: CPPFLAGS: "-I/usr/local/include" LDFLAGS: "-L/usr/local/lib" @@ -33,7 +33,8 @@ jobs: # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" - export PATH="$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin" + export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin" + export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" ./run_unittests.py project-tests-appleclang: @@ -45,7 +46,7 @@ jobs: - uses: actions/checkout@v2 # use python3 from homebrew because it is a valid framework, unlike the actions one: # https://github.com/actions/setup-python/issues/58 - - run: brew install pkg-config ninja llvm qt boost ldc hdf5 openmpi lapack scalapack sdl2 python3 + - run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 python3 - run: | python3 -m pip install --upgrade setuptools python3 -m pip install --upgrade pip @@ -58,7 +59,8 @@ jobs: # These cannot evaluate anything, so we cannot set PATH or SDKROOT here run: | export SDKROOT="$(xcodebuild -version -sdk macosx Path)" - export PATH="$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin" + export PATH="$HOME/tools:/usr/local/opt/qt@5/bin:$PATH:$(brew --prefix llvm)/bin" + export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH" ./run_project_tests.py --backend=ninja Qt4macos: |