Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into feature/#485_notion_separation_of_loaders_and_generators

.gitlab-ci.yml

@@ -367,41 +367,41 @@ test:linux_nightly:clang:
 
 # common builds
 
-conan:linux:gcc5.3.1:
-  stage: conan
-  except:
-    - schedules
-  tags:
-    - gcc5.3.1
-    - opengl
-  script:
-    - mkdir build
-    - cd build
-    - export CC=gcc
-    - export CXX=g++
-    - conan install .. --build=missing -s compiler="gcc" -s compiler.version="5.3" -s compiler.libcxx="libstdc++11" -s build_type=Release
-  artifacts:
-    paths:
-    - build
-    expire_in: 1 week
-    
-conan:linux:gcc6.3.1:
-  stage: conan
-  except:
-    - schedules
-  tags:
-    - gcc6.3.1
-    - opengl
-  script:
-    - mkdir build
-    - cd build
-    - export CC=gcc
-    - export CXX=g++
-    - conan install .. --build=missing -s compiler="gcc" -s compiler.version="6.3" -s compiler.libcxx="libstdc++11" -s build_type=Release
-  artifacts:
-    paths:
-    - build
-    expire_in: 1 week
+# conan:linux:gcc5.3.1:
+  # stage: conan
+  # except:
+    # - schedules
+  # tags:
+    # - gcc5.3.1
+    # - opengl
+  # script:
+    # - mkdir build
+    # - cd build
+    # - export CC=gcc
+    # - export CXX=g++
+    # - conan install .. --build=missing -s compiler="gcc" -s compiler.version="5.3" -s compiler.libcxx="libstdc++11" -s build_type=Release
+  # artifacts:
+    # paths:
+    # - build
+    # expire_in: 1 week
+    
+# conan:linux:gcc6.3.1:
+  # stage: conan
+  # except:
+    # - schedules
+  # tags:
+    # - gcc6.3.1
+    # - opengl
+  # script:
+    # - mkdir build
+    # - cd build
+    # - export CC=gcc
+    # - export CXX=g++
+    # - conan install .. --build=missing -s compiler="gcc" -s compiler.version="6.3" -s compiler.libcxx="libstdc++11" -s build_type=Release
+  # artifacts:
+    # paths:
+    # - build
+    # expire_in: 1 week
 
 conan:linux:gcc7.3.1:
   stage: conan
@@ -421,41 +421,41 @@ conan:linux:gcc7.3.1:
     - build
     expire_in: 1 week    
     
-cmake:linux:gcc5.3.1:
-  stage: cmake
-  except:
-    - schedules
-  tags:
-    - gcc5.3.1
-    - opengl
-  dependencies:
-    - conan:linux:gcc5.3.1
-  script:
-    - cd build
-    - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
-  artifacts:
-    untracked: true
-    paths:
-    - build
-    expire_in: 1 week
-
-cmake:linux:gcc6.3.1:
-  stage: cmake
-  except:
-    - schedules
-  tags:
-    - gcc6.3.1
-    - opengl
-  dependencies:
-    - conan:linux:gcc6.3.1
-  script:
-    - cd build
-    - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
-  artifacts:
-    untracked: true
-    paths:
-    - build
-    expire_in: 1 week
+# cmake:linux:gcc5.3.1:
+  # stage: cmake
+  # except:
+    # - schedules
+  # tags:
+    # - gcc5.3.1
+    # - opengl
+  # dependencies:
+    # - conan:linux:gcc5.3.1
+  # script:
+    # - cd build
+    # - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
+  # artifacts:
+    # untracked: true
+    # paths:
+    # - build
+    # expire_in: 1 week
+
+# cmake:linux:gcc6.3.1:
+  # stage: cmake
+  # except:
+    # - schedules
+  # tags:
+    # - gcc6.3.1
+    # - opengl
+  # dependencies:
+    # - conan:linux:gcc6.3.1
+  # script:
+    # - cd build
+    # - cmake .. -DIS_BUILD_SERVER:BOOL=TRUE -DCMAKE_BUILD_TYPE=Release
+  # artifacts:
+    # untracked: true
+    # paths:
+    # - build
+    # expire_in: 1 week
 
 cmake:linux:gcc7.3.1:
   stage: cmake
@@ -475,45 +475,45 @@ cmake:linux:gcc7.3.1:
     - build
     expire_in: 1 week    
     
-build:linux:gcc5.3.1:
-  stage: build
-  except:
-    - schedules
-  tags:
-    - gcc5.3.1
-    - opengl
-  dependencies:
-    - cmake:linux:gcc5.3.1
-  script:
-    - cd build
-    - make Cpplint-Test-Suite
-    - make Cppcheck-Test-Suite
-    - make -j8
-  artifacts:
-    paths:
-    - build
-    expire_in: 1 week
-  allow_failure: true
-
-build:linux:gcc6.3.1:
-  stage: build
-  except:
-    - schedules
-  tags:
-    - gcc6.3.1
-    - opengl
-  dependencies:
-    - cmake:linux:gcc6.3.1
-  script:
-    - cd build
-    - make Cpplint-Test-Suite
-    - make Cppcheck-Test-Suite
-    - make -j8
-  artifacts:
-    paths:
-    - build
-    expire_in: 1 week
-  allow_failure: true
+# build:linux:gcc5.3.1:
+  # stage: build
+  # except:
+    # - schedules
+  # tags:
+    # - gcc5.3.1
+    # - opengl
+  # dependencies:
+    # - cmake:linux:gcc5.3.1
+  # script:
+    # - cd build
+    # - make Cpplint-Test-Suite
+    # - make Cppcheck-Test-Suite
+    # - make -j8
+  # artifacts:
+    # paths:
+    # - build
+    # expire_in: 1 week
+  # allow_failure: true
+
+# build:linux:gcc6.3.1:
+  # stage: build
+  # except:
+    # - schedules
+  # tags:
+    # - gcc6.3.1
+    # - opengl
+  # dependencies:
+    # - cmake:linux:gcc6.3.1
+  # script:
+    # - cd build
+    # - make Cpplint-Test-Suite
+    # - make Cppcheck-Test-Suite
+    # - make -j8
+  # artifacts:
+    # paths:
+    # - build
+    # expire_in: 1 week
+  # allow_failure: true
 
 build:linux:gcc7.3.1:
   stage: build
@@ -536,31 +536,31 @@ build:linux:gcc7.3.1:
     expire_in: 1 week
   allow_failure: true  
   
-test:linux:gcc5.3.1:
-  stage: test
-  except:
-    - schedules
-  tags:
-    - gcc5.3.1
-    - opengl
-  dependencies:
-    - build:linux:gcc5.3.1
-  script:
-    - cd build
-    - make Unit-Test-Suite
-
-test:linux:gcc6.3.1:
-  stage: test
-  except:
-    - schedules
-  tags:
-    - gcc6.3.1
-    - opengl
-  dependencies:
-    - build:linux:gcc6.3.1
-  script:
-    - cd build
-    - make Unit-Test-Suite
+# test:linux:gcc5.3.1:
+  # stage: test
+  # except:
+    # - schedules
+  # tags:
+    # - gcc5.3.1
+    # - opengl
+  # dependencies:
+    # - build:linux:gcc5.3.1
+  # script:
+    # - cd build
+    # - make Unit-Test-Suite
+
+# test:linux:gcc6.3.1:
+  # stage: test
+  # except:
+    # - schedules
+  # tags:
+    # - gcc6.3.1
+    # - opengl
+  # dependencies:
+    # - build:linux:gcc6.3.1
+  # script:
+    # - cd build
+    # - make Unit-Test-Suite
 
 test:linux:gcc7.3.1:
   stage: test