clean output / avoid segi runners

.gitlab-ci.yml

@@ -10,18 +10,18 @@ default:
 
 .global_tag: &global_tag_def
     tags:
+        - mn2l
 #        - warson   # you can choose a set of runners here
 
 stages:
-    - format
     - build
     - test
 
 format:
     <<: *global_tag_def
-    stage: format
+    stage: build
     script:
-        - python3 ./scripts/format_code.py
+        - ./scripts/format_code.py
         - mkdir -p patches
         - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
     artifacts:
@@ -31,75 +31,74 @@ format:
         when: on_failure
     allow_failure: true
 
+build-no-tlnos:
+    <<: *global_tag_def
+    stage: build
+    script:
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
+        - make -j 8
 
-# build-no-tlnos:
-#     <<: *global_tag_def
-#     stage: build
-#     script:
-#         - rm -rf build workspace
-#         - mkdir build
-#         - cd build
-#         - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
-#         - make -j 8
-
-# build:
-#     <<: *global_tag_def
-#     stage: build
-#     script:
-#         - rm -rf build workspace
-#         - mkdir build
-#         - cd build
-#         - cmake -Wno-dev ..
-#         - make -j 8
-#     artifacts:
-#         paths:
-#             - build/
-#         expire_in: 1 day
+build:
+    <<: *global_tag_def
+    stage: build
+    script:
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -Wno-dev ..
+        - make -j 8
+    artifacts:
+        paths:
+            - build/
+        expire_in: 1 day
 
-# build-red:
-#     <<: *global_tag_def
-#     image: rboman/waves-py3-red:2020.3
-#     stage: build
-#     script:
-#         - rm -rf build workspace
-#         - mkdir build
-#         - cd build
-#         - cmake -Wno-dev ..
-#         - make -j 8
-#     artifacts:
-#         paths:
-#             - build/
-#         expire_in: 1 day
+build-red:
+    <<: *global_tag_def
+    image: rboman/waves-py3-red:2020.3
+    stage: build
+    script:
+        - rm -rf build workspace
+        - mkdir build
+        - cd build
+        - cmake -Wno-dev ..
+        - make -j 8
+    artifacts:
+        paths:
+            - build/
+        expire_in: 1 day
             
-# doxygen:
-#     <<: *global_tag_def
-#     stage: test
-#     script:
-#         - cd build
-#         - make dox
-#     artifacts:
-#         paths:
-#             - build/doxygen/
-#         expire_in: 1 week
-#     dependencies:
-#         - build
+doxygen:
+    <<: *global_tag_def
+    stage: test
+    script:
+        - cd build
+        - make dox
+    artifacts:
+        paths:
+            - build/doxygen/
+        expire_in: 1 week
+    dependencies:
+        - build
 
-# ctest:
-#     <<: *global_tag_def
-#     stage: test
-#     script:
-#         - cd build
-#         - ctest --output-on-failure -j 8
-#     #timeout: 10 hours  # will be available in 12.3
-#     dependencies:
-#         - build
+ctest:
+    <<: *global_tag_def
+    stage: test
+    script:
+        - cd build
+        - ctest --output-on-failure -j 8
+    #timeout: 10 hours  # will be available in 12.3
+    dependencies:
+        - build
         
-# ctest-red:
-#     <<: *global_tag_def
-#     image: rboman/waves-py3-red:2020.3
-#     stage: test
-#     script:
-#         - cd build
-#         - ctest --output-on-failure -j 8 -R katropton
-#     dependencies:
-#         - build-red
+ctest-red:
+    <<: *global_tag_def
+    image: rboman/waves-py3-red:2020.3
+    stage: test
+    script:
+        - cd build
+        - ctest --output-on-failure -j 8 -R katropton
+    dependencies:
+        - build-red

scripts/format_code.py

@@ -42,7 +42,7 @@ def main():
     # loop over all files and format them
     encs = {}
     for f in all_files(os.getcwd(), patterns='*.cpp;*.c;*.h;*.hpp'):
-        print(f)
+        # print(f)
         cmd = ['clang-format', "-style=file", "-i", f]
         retcode = subprocess.call(cmd)
         if retcode != 0:
@@ -51,5 +51,5 @@ def main():
 
 
 if __name__ == "__main__":
-    print('running format_code.py...')
+    # print('running format_code.py...')
     main()