Commit bb3d6e81 authored by Jan Möbius's avatar Jan Möbius

Switched Mac CI to Qt 5.11.2

parent 22f60b9b
Pipeline #7992 canceled with stages
in 2 minutes and 2 seconds
...@@ -407,6 +407,7 @@ Mac-Cpp11: ...@@ -407,6 +407,7 @@ Mac-Cpp11:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
tags: tags:
- Apple - Apple
- qt-5.11.3
artifacts: artifacts:
expire_in: 1 week expire_in: 1 week
paths: paths:
...@@ -419,6 +420,7 @@ Test:Mac-Cpp11: ...@@ -419,6 +420,7 @@ Test:Mac-Cpp11:
GIT_STRATEGY: none GIT_STRATEGY: none
tags: tags:
- Apple - Apple
- qt-5.11.3
dependencies: dependencies:
- Mac-Cpp11 - Mac-Cpp11
artifacts: artifacts:
...@@ -435,6 +437,7 @@ Deploy:Mac-Cpp11: ...@@ -435,6 +437,7 @@ Deploy:Mac-Cpp11:
GIT_STRATEGY: none GIT_STRATEGY: none
tags: tags:
- Apple - Apple
- qt-5.11.3
dependencies: dependencies:
- Mac-Cpp11 - Mac-Cpp11
artifacts: artifacts:
......
...@@ -15,7 +15,7 @@ fi ...@@ -15,7 +15,7 @@ fi
cd build-release cd build-release
# Build without ports to avoid qt4 collision # Build without ports to avoid qt4 collision
/opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework -DQT5_INSTALL_PATH=/Qt/Qt5.5.1/5.5/clang_64 -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib /opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework -DQT5_INSTALL_PATH=/Users/jenkins/sw/Qt/5.11.3/clang_64/ -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
make make
...@@ -30,4 +30,4 @@ if [ ! -d artifacts ]; then ...@@ -30,4 +30,4 @@ if [ ! -d artifacts ]; then
fi fi
#cp -R * artifacts #cp -R * artifacts
rsync -a --exclude=artifacts --exclude=.git . ./artifacts rsync -a --exclude=artifacts --exclude=.git . ./artifacts
\ No newline at end of file
...@@ -27,10 +27,10 @@ fi ...@@ -27,10 +27,10 @@ fi
# Build without ports to avoid qt4 collision # Build without ports to avoid qt4 collision
# fix pathes if run on a different machine # fix pathes if run on a different machine
/opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework -DQT5_INSTALL_PATH=/Qt/Qt5.5.1/5.5/clang_64 -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib /opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework -DQT5_INSTALL_PATH=/Users/jenkins/sw/Qt/5.11.3/clang_64/ -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
rm -f *.dmg rm -f *.dmg
make OpenFlipper_package make OpenFlipper_package
mv *.dmg OpenFlipper-Free-GIT-$CI_BUILD_REF-QT5.5.1-CPP11.dmg mv *.dmg OpenFlipper-Free-GIT-$CI_BUILD_REF-QT5.11.3-CPP11.dmg
\ No newline at end of file
...@@ -27,7 +27,7 @@ fi ...@@ -27,7 +27,7 @@ fi
# Build without ports to avoid qt4 collision # Build without ports to avoid qt4 collision
# run this prior testing to fix paths # run this prior testing to fix paths
/opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.2-Qt5-installed/lib/qwt.framework -DQT5_INSTALL_PATH=/Qt/Qt5.5.1/5.5/clang_64 -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib /opt/local/bin/cmake ../ -DCMAKE_CXX_FLAGS='-std=c++11' -DQWT6_INCLUDE_DIR=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework/Headers -DQWT6_LIBRARY=/Users/jenkins/sw/qwt-6.1.3-qt5.11.2/lib/qwt.framework -DQT5_INSTALL_PATH=/Users/jenkins/sw/Qt/5.11.3/clang_64/ -DGLEW_INCLUDE_DIR=/Users/jenkins/sw/glew-1.10.0-installed/include/ -DGLEW_LIBRARY=/Users/jenkins/sw/glew-1.10.0-installed/lib/libGLEW.dylib
######################################## ########################################
...@@ -36,4 +36,4 @@ fi ...@@ -36,4 +36,4 @@ fi
# Run tests # Run tests
cd tests cd tests
bash run_tests.sh bash run_tests.sh
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment