CI: add installation of Qt5 on macOS

This is a dependency for building Gvedit on macOS. Note that installation is not
added to the CMake test job because Gvedit is not currently built in the CMake
build system on macOS.

Gitlab: #1842, #1854

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 480d22dfe336eea9f481c3ae317060bba8d43534..6af9dd04c8e9ba95b8fe5a3b2d2eca43e606f946 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,6 +88,11 @@ portable-source:
         - brew install cmake || brew upgrade cmake
         - brew install bison || brew upgrade bison
         - brew install pango || brew upgrade pango
+        - brew install qt5 || brew upgrade qt5
+        - export PATH="/usr/local/opt/qt@5/bin:$PATH"
+        - export LDFLAGS="-L/usr/local/opt/qt@5/lib"
+        - export CPPFLAGS="-I/usr/local/opt/qt@5/include"
+        - export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"
         - brew install libxaw || brew upgrade libxaw
         - export PATH="/usr/local/opt/bison/bin:$PATH"
         - logfile=`mktemp`
@@ -1148,6 +1153,11 @@ macos-autotools-test:
     before_script:
         - brew update
         - brew install pango || brew upgrade pango
+        - brew install qt5 || brew upgrade qt5
+        - export PATH="/usr/local/opt/qt@5/bin:$PATH"
+        - export LDFLAGS="-L/usr/local/opt/qt@5/lib"
+        - export CPPFLAGS="-I/usr/local/opt/qt@5/include"
+        - export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"
         - brew install libxaw || brew upgrade libxaw
         - python3 -m pip install --requirement requirements.txt
         - export build_system="autotools"

diff --git a/ci/tests.py b/ci/tests.py
index 8d76eee965b9b84eefbbbc03f503cf373ae2b4ea..8ee817b8e78df33cdd2aa59ebdda5769ca6f39fb 100644 (file)
--- a/ci/tests.py
+++ b/ci/tests.py
@@ -89,7 +89,6 @@ def test_existence(binary: str):
   ]
 
   tools_not_built_with_autotools_on_macos = [
-    "gvedit",
     "mingle",
     "smyrna",
   ]