Test CI

andre-schulz · Aug 8, 2024 · 3072bbb · 3072bbb
1 parent ccd2ad1
commit 3072bbb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,15 @@ jobs:
     - name: Install Ubuntu dependencies
       if: runner.os == 'Linux'
       run: |
+        echo "::group::apt-get update"
         sudo apt-get update
+        echo "::endgroup::"
+
+        echo "::group::apt-get upgrade"
+        sudo apt-get upgrade -y
+        echo "::endgroup::"
+
+        echo "::group::apt-get install"
         sudo apt-get install \
           build-essential \
           clang \
@@ -48,35 +56,56 @@ jobs:
           libtiff-dev \
           pkg-config \
           zlib1g-dev
+        echo "::endgroup::"
 
     - name: Install macOS dependencies
       if: runner.os == 'macOS'
       run: |
+        echo "::group::brew update"
         brew update
-        brew upgrade
+        echo "::endgroup::"
+
+        echo "::group::brew install"
         brew install -q \
           googletest \
           jpeg-turbo \
           libpng \
           libtiff \
           qt@5
+        echo "::endgroup::"
+
+        echo "::group::brew link"
         brew link qt@5
+        echo "::endgroup::"
 
-    - name: Build MVE on Linux/macOS
+    - name: Build (U)MVE on Linux/macOS
       run: |
         ${CXX} --version
-        uname -a
         if [ "`uname`" = "Darwin" ]; then
           export NUM_CPU_CORES="`sysctl -n hw.ncpu`"
         else
           export NUM_CPU_CORES="`nproc`"
         fi
+
+        echo "::group::Build MVE"
         make -j${NUM_CPU_CORES}
-        cd apps/umve
+        echo "::endgroup"::
+
+        echo "::group::Build UMVE"
+        qmake --version
+        pushd apps/umve
+        if [ "${CXX}" = "clang++" ]; then
+          echo "QMAKE_CXX = clang++" > umve.priv.pro
+          echo "QMAKE_LINK = clang++" >> umve.priv.pro
+        fi
         qmake
         make -j${NUM_CPU_CORES}
-        cd ../..
+        popd
+        echo "::endgroup::"
+
+        echo "::group::Build tests"
         make -j${NUM_CPU_CORES} test
+        echo "::endgroup::"
 
     - name: Run tests
       run: ./tests/test

diff --git a/apps/umve/umve.pro b/apps/umve/umve.pro
@@ -23,7 +23,7 @@ RCC_DIR = build
 
 # Options specific to OS X.
 macx {
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
+    #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
     CONFIG -= app_bundle
     QMAKE_LFLAGS += -L/usr/local/lib
     QMAKE_LFLAGS -= -fopenmp