diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e209960e5c1773ac2052ce437c2cbfc4de705c6..150f2086ef993d2e37c21aacb39c67a6d09e1dfc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,6 @@ stages: - pretest - test - - merge_request - deploy - benchmark @@ -99,10 +98,6 @@ intel_18_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -127,10 +122,6 @@ intel_18_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -151,10 +142,10 @@ intel_18_hybrid: WALBERLA_ENABLE_GUI: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false + only: + variables: + - $ENABLE_NIGHTLY_BUILDS + tags: - cuda - docker @@ -178,10 +169,10 @@ intel_18_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false + only: + variables: + - $ENABLE_NIGHTLY_BUILDS + tags: - cuda - docker @@ -207,10 +198,6 @@ intel_18_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -231,10 +218,6 @@ intel_18_hybrid_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -253,10 +236,6 @@ intel_18_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -283,10 +262,6 @@ intel_19_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -311,10 +286,6 @@ intel_19_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -334,10 +305,6 @@ intel_19_hybrid: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -361,10 +328,6 @@ intel_19_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -386,10 +349,6 @@ intel_19_mpionly_dbg: WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -424,10 +383,6 @@ intel_19_hybrid_dbg_sp: WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -454,10 +409,6 @@ gcc_7_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -481,10 +432,6 @@ gcc_7_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -503,10 +450,10 @@ gcc_7_hybrid: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false + only: + variables: + - $ENABLE_NIGHTLY_BUILDS + tags: - cuda - docker @@ -530,10 +477,10 @@ gcc_7_serial_dbg: WALBERLA_ENABLE_GUI: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false + only: + variables: + - $ENABLE_NIGHTLY_BUILDS + tags: - cuda - docker @@ -558,10 +505,6 @@ gcc_7_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -581,10 +524,6 @@ gcc_7_hybrid_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -602,10 +541,6 @@ gcc_7_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -631,10 +566,6 @@ gcc_8_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -658,10 +589,6 @@ gcc_8_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -684,10 +611,6 @@ gcc_8_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -714,10 +637,6 @@ gcc_8_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -742,10 +661,6 @@ gcc_8_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -769,10 +684,6 @@ gcc_8_hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -790,10 +701,6 @@ gcc_8_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -818,10 +725,6 @@ gcc_9_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -843,10 +746,6 @@ gcc_9_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -867,10 +766,6 @@ gcc_9_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -895,10 +790,6 @@ gcc_9_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -921,10 +812,6 @@ gcc_9_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -946,10 +833,6 @@ gcc_9_hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -966,10 +849,6 @@ gcc_9_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -993,10 +872,6 @@ gcc_10_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -1018,10 +893,6 @@ gcc_10_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -1077,10 +948,6 @@ gcc_10_mpionly_dbg: WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -1098,10 +965,6 @@ gcc_10_hybrid_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -1114,10 +977,6 @@ gcc_10_hybrid_dbg_sp: WALBERLA_DOUBLE_ACCURACY: "OFF" WALBERLA_BUILD_WITH_PARMETIS: "OFF" WALBERLA_BUILD_WITH_METIS: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker @@ -1142,10 +1001,6 @@ clang_6.0_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1169,10 +1024,6 @@ clang_6.0_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1195,10 +1046,6 @@ clang_6.0_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1225,10 +1072,6 @@ clang_6.0_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1253,10 +1096,6 @@ clang_6.0_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1276,10 +1115,6 @@ clang_6.0_hybrid_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1297,10 +1132,6 @@ clang_6.0_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1326,10 +1157,6 @@ clang_7.0_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1353,10 +1180,6 @@ clang_7.0_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1379,10 +1202,6 @@ clang_7.0_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1409,10 +1228,6 @@ clang_7.0_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1437,10 +1252,6 @@ clang_7.0_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1464,10 +1275,6 @@ clang_7.0_hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1485,10 +1292,6 @@ clang_7.0_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1514,10 +1317,6 @@ clang_8.0_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1541,10 +1340,6 @@ clang_8.0_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1567,10 +1362,6 @@ clang_8.0_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1597,10 +1388,6 @@ clang_8.0_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1625,10 +1412,6 @@ clang_8.0_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1652,10 +1435,6 @@ clang_8.0_hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1673,10 +1452,6 @@ clang_8.0_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1702,10 +1477,6 @@ clang_9.0_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1729,10 +1500,6 @@ clang_9.0_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1755,10 +1522,6 @@ clang_9.0_hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1785,10 +1548,6 @@ clang_9.0_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1813,10 +1572,6 @@ clang_9.0_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1840,10 +1595,6 @@ clang_9.0_hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1861,10 +1612,6 @@ clang_9.0_hybrid_dbg_sp: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1890,10 +1637,6 @@ clang_10.0_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1917,10 +1660,6 @@ clang_10.0_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1939,10 +1678,6 @@ clang_10.0_hybrid: WALBERLA_BUILD_WITH_CUDA: "ON" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -1965,10 +1700,6 @@ clang_10.0_serial_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -2008,10 +1739,6 @@ clang_10.0_hybrid_dbg: CMAKE_BUILD_TYPE: "DebugOptimized" WALBERLA_BUILD_WITH_CODEGEN: "ON" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - cuda - docker @@ -2044,10 +1771,6 @@ gcc_8_hybrid_dbg_noboost: WALBERLA_BUILD_WITH_PYTHON: "OFF" tags: - docker - stage: merge_request - when: manual - needs: [] - allow_failure: false @@ -2078,10 +1801,6 @@ gcc_10_stl_debug: WALBERLA_STL_BOUNDS_CHECKS: "ON" tags: - docker - stage: merge_request - when: manual - needs: [ ] - allow_failure: false @@ -2101,10 +1820,6 @@ doc: - cmake .. - cmake . -LA - make doc - stage: merge_request - when: manual - needs: [] - allow_failure: false tags: - docker artifacts: @@ -2132,10 +1847,6 @@ clang-tidy: - cmake . -LA - utilities/filterCompileCommands.py compile_commands.json - run-clang-tidy.py -quiet | tee clang-tidy-output.txt - stage: merge_request - when: manual - needs: [] - allow_failure: false artifacts: paths: - $CI_PROJECT_DIR/build/clang-tidy-output.txt @@ -2231,10 +1942,6 @@ msvc-14.1_Hybrid_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_Hybrid_sp_dbg: @@ -2248,10 +1955,6 @@ msvc-14.1_Hybrid_sp_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_Hybrid: @@ -2263,10 +1966,6 @@ msvc-14.1_Hybrid: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_serial_dbg: @@ -2281,10 +1980,6 @@ msvc-14.1_serial_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_serial: @@ -2298,10 +1993,6 @@ msvc-14.1_serial: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_mpionly_dbg: @@ -2315,10 +2006,6 @@ msvc-14.1_mpionly_dbg: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.1_mpionly: @@ -2331,10 +2018,6 @@ msvc-14.1_mpionly: variables: - $ENABLE_NIGHTLY_BUILDS - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_Hybrid_dbg: @@ -2352,10 +2035,6 @@ msvc-14.2_Hybrid_sp_dbg: CMAKE_GENERATOR: "Visual Studio 16 2019" BUILD_CONFIGURATION: "DebugOptimized" WALBERLA_DOUBLE_ACCURACY: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_Hybrid: @@ -2363,10 +2042,6 @@ msvc-14.2_Hybrid: variables: WALBERLA_BUILD_WITH_CUDA: "OFF" CMAKE_GENERATOR: "Visual Studio 16 2019" - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_serial_dbg: @@ -2377,10 +2052,6 @@ msvc-14.2_serial_dbg: WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" BUILD_CONFIGURATION: "DebugOptimized" - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_serial: @@ -2390,10 +2061,6 @@ msvc-14.2_serial: CMAKE_GENERATOR: "Visual Studio 16 2019" WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_mpionly_dbg: @@ -2403,10 +2070,6 @@ msvc-14.2_mpionly_dbg: CMAKE_GENERATOR: "Visual Studio 16 2019" BUILD_CONFIGURATION: "DebugOptimized" WALBERLA_BUILD_WITH_OPENMP: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false msvc-14.2_mpionly: @@ -2415,10 +2078,6 @@ msvc-14.2_mpionly: WALBERLA_BUILD_WITH_CUDA: "OFF" CMAKE_GENERATOR: "Visual Studio 16 2019" WALBERLA_BUILD_WITH_OPENMP: "OFF" - stage: merge_request - when: manual - needs: [] - allow_failure: false @@ -2454,10 +2113,6 @@ mac_Serial_Dbg: WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false mac_Serial: <<: *mac_build_definition @@ -2467,10 +2122,6 @@ mac_Serial: WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" - stage: merge_request - when: manual - needs: [] - allow_failure: false mac_MpiOnly_Dbg: <<: *mac_build_definition @@ -2491,10 +2142,6 @@ mac_MpiOnly: WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" OMPI_MCA_btl: "self,tcp" - stage: merge_request - when: manual - needs: [] - allow_failure: false ############################################################################### ## ## @@ -2513,8 +2160,6 @@ mac_MpiOnly: - anaconda logout dependencies: [] when: manual - needs: [] - allow_failure: false only: - master@walberla/walberla - tags@walberla/walberla