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

Merge branch 'needs' into 'master'

Try new feature of gitlab allowing better dependency tracking of the stages...

See merge request !344
parents 76249bfb d91094b8
Pipeline #11901 passed with stages
in 40 minutes and 11 seconds
...@@ -38,6 +38,7 @@ test-gcc-c++11-Qt5.12.2: ...@@ -38,6 +38,7 @@ test-gcc-c++11-Qt5.12.2:
- stretch - stretch
dependencies: dependencies:
- gcc-c++11-Qt5.12.2 - gcc-c++11-Qt5.12.2
needs: [gcc-c++11-Qt5.12.2]
artifacts: artifacts:
paths: paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log - build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
...@@ -90,6 +91,7 @@ test-gcc-c++11-Qt5.11.2: ...@@ -90,6 +91,7 @@ test-gcc-c++11-Qt5.11.2:
- stretch - stretch
dependencies: dependencies:
- gcc-c++11-Qt5.11.2 - gcc-c++11-Qt5.11.2
needs: [gcc-c++11-Qt5.11.2]
artifacts: artifacts:
paths: paths:
- build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log - build-Release-gcc-cpp11-qt5/Testing/Temporary/LastTest.log
...@@ -142,6 +144,7 @@ test-gcc-c++11-Qt5.13.0: ...@@ -142,6 +144,7 @@ test-gcc-c++11-Qt5.13.0:
- stretch - stretch
dependencies: dependencies:
- gcc-c++11-Qt5.13.0 - gcc-c++11-Qt5.13.0
needs: [gcc-c++11-Qt5.13.0]
artifacts: artifacts:
paths: paths:
- build-Release-gcc-cpp11-qt5.13.0/Testing/Temporary/LastTest.log - build-Release-gcc-cpp11-qt5.13.0/Testing/Temporary/LastTest.log
...@@ -179,6 +182,7 @@ debug-test-gcc-c++11-Qt5.13.0: ...@@ -179,6 +182,7 @@ debug-test-gcc-c++11-Qt5.13.0:
- stretch - stretch
dependencies: dependencies:
- debug-gcc-c++11-Qt5.13.0 - debug-gcc-c++11-Qt5.13.0
needs: [debug-gcc-c++11-Qt5.13.0]
artifacts: artifacts:
paths: paths:
- build-Debug-gcc-cpp11-qt5.13.0/Testing/Temporary/LastTest.log - build-Debug-gcc-cpp11-qt5.13.0/Testing/Temporary/LastTest.log
...@@ -213,6 +217,7 @@ test-gcc-c++11-Qt5.11.2: ...@@ -213,6 +217,7 @@ test-gcc-c++11-Qt5.11.2:
- stretch - stretch
dependencies: dependencies:
- gcc-c++11-Qt5.11.2 - gcc-c++11-Qt5.11.2
needs: [gcc-c++11-Qt5.11.2]
artifacts: artifacts:
paths: paths:
- build-Release-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log - build-Release-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
...@@ -249,6 +254,7 @@ debug-test-gcc-c++11-Qt5.11.2: ...@@ -249,6 +254,7 @@ debug-test-gcc-c++11-Qt5.11.2:
- stretch - stretch
dependencies: dependencies:
- debug-gcc-c++11-Qt5.11.2 - debug-gcc-c++11-Qt5.11.2
needs: [debug-gcc-c++11-Qt5.11.2]
artifacts: artifacts:
paths: paths:
- build-Debug-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log - build-Debug-gcc-cpp11-qt5.11.2/Testing/Temporary/LastTest.log
...@@ -321,6 +327,7 @@ test-clang-c++11-Qt5.11.2: ...@@ -321,6 +327,7 @@ test-clang-c++11-Qt5.11.2:
- MultiThreads - MultiThreads
dependencies: dependencies:
- clang-c++11-Qt5.11.2 - clang-c++11-Qt5.11.2
needs: [clang-c++11-Qt5.11.2]
artifacts: artifacts:
paths: paths:
- build-Release-clang-cpp11-qt5/Testing/Temporary/LastTest.log - build-Release-clang-cpp11-qt5/Testing/Temporary/LastTest.log
...@@ -339,6 +346,7 @@ test-clang-c++11-Qt5.13.0: ...@@ -339,6 +346,7 @@ test-clang-c++11-Qt5.13.0:
- MultiThreads - MultiThreads
dependencies: dependencies:
- clang-c++11-Qt5.13.0 - clang-c++11-Qt5.13.0
needs: [clang-c++11-Qt5.13.0]
artifacts: artifacts:
paths: paths:
- build-Release-clang-cpp11-qt5.13.0/Testing/Temporary/LastTest.log - build-Release-clang-cpp11-qt5.13.0/Testing/Temporary/LastTest.log
...@@ -358,6 +366,7 @@ debug-test-clang-c++11-Qt5.13.0: ...@@ -358,6 +366,7 @@ debug-test-clang-c++11-Qt5.13.0:
- MultiThreads - MultiThreads
dependencies: dependencies:
- debug-clang-c++11-Qt5.13.0 - debug-clang-c++11-Qt5.13.0
needs: [debug-clang-c++11-Qt5.13.0]
artifacts: artifacts:
paths: paths:
- build-Debug-clang-cpp11-qt5.13.0/Testing/Temporary/LastTest.log - build-Debug-clang-cpp11-qt5.13.0/Testing/Temporary/LastTest.log
...@@ -421,6 +430,7 @@ Test:VS2015-Qt-5.10.1-x64: ...@@ -421,6 +430,7 @@ Test:VS2015-Qt-5.10.1-x64:
- Qt5101 - Qt5101
dependencies: dependencies:
- VS2015-Qt-5.10.1-x64 - VS2015-Qt-5.10.1-x64
needs: [VS2015-Qt-5.10.1-x64]
artifacts: artifacts:
paths: paths:
- rel/Testing/Temporary/LastTest.log - rel/Testing/Temporary/LastTest.log
...@@ -439,6 +449,7 @@ Test:VS2017-Qt-5.10.1: ...@@ -439,6 +449,7 @@ Test:VS2017-Qt-5.10.1:
- Qt5101 - Qt5101
dependencies: dependencies:
- VS2017-Qt-5.10.1 - VS2017-Qt-5.10.1
needs: [VS2017-Qt-5.10.1]
artifacts: artifacts:
paths: paths:
- rel/Testing/Temporary/LastTest.log - rel/Testing/Temporary/LastTest.log
...@@ -460,6 +471,7 @@ Deploy:VS2015-Qt-5.10.1-x64: ...@@ -460,6 +471,7 @@ Deploy:VS2015-Qt-5.10.1-x64:
- Qt5101 - Qt5101
dependencies: dependencies:
- VS2015-Qt-5.10.1-x64 - VS2015-Qt-5.10.1-x64
needs: [VS2015-Qt-5.10.1-x64]
artifacts: artifacts:
paths: paths:
- rel/*.exe - rel/*.exe
...@@ -481,6 +493,7 @@ Deploy:VS2017-Qt-5.10.1: ...@@ -481,6 +493,7 @@ Deploy:VS2017-Qt-5.10.1:
- Qt5101 - Qt5101
dependencies: dependencies:
- VS2017-Qt-5.10.1 - VS2017-Qt-5.10.1
needs: [VS2017-Qt-5.10.1]
artifacts: artifacts:
paths: paths:
- rel/*.exe - rel/*.exe
...@@ -508,6 +521,7 @@ Test:Mac-Cpp11: ...@@ -508,6 +521,7 @@ Test:Mac-Cpp11:
- qt5113 - qt5113
dependencies: dependencies:
- Mac-Cpp11 - Mac-Cpp11
needs: [Mac-Cpp11]
artifacts: artifacts:
paths: paths:
- build-release/Testing/Temporary/LastTest.log - build-release/Testing/Temporary/LastTest.log
...@@ -525,6 +539,7 @@ Deploy:Mac-Cpp11: ...@@ -525,6 +539,7 @@ Deploy:Mac-Cpp11:
- qt5113 - qt5113
dependencies: dependencies:
- Mac-Cpp11 - Mac-Cpp11
needs: [Mac-Cpp11]
artifacts: artifacts:
paths: paths:
- build-release/*.dmg - build-release/*.dmg
......
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