From 253406ad5032e721e65a72e511c48fac70b7c54c Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Tue, 19 Mar 2024 22:20:43 +0100 Subject: [PATCH 01/10] [gitlab] update gitlab config --- .gitlab-ci.yml | 670 ++++++++++--------------------------------------- 1 file changed, 139 insertions(+), 531 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f885b6e9..b1f38cd0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,90 +1,46 @@ -# To contribute improvements to CI/CD templates, please follow the Development guide at: -# https://docs.gitlab.com/ee/development/cicd/templates.html -# This specific template is located at: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/C++.gitlab-ci.yml -# using Radium development dedicated image -# image: stormirit/radium_dev:latest -#image: docker-linux variables: - CACHE_PATH: "cache13" + CACHE_PATH: "cache16" GIT_STRATEGY: fetch LINUX_TAG: "linux" WIN_TAG: "windows" MACOS_TAG: "macOs" - # GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH -#https://docs.gitlab.com/ee/ci/yaml/#extends # .branches_with_ci: # only: # - master - stages: - # - dep - # - fetch - build - # - build-debug - # - build-release - - test + # - test # - coverage - # - code-analysis + - code-analysis # - format # - doc -# cache: -# key: ${CI_COMMIT_REF_SLUG} -# paths: -# - build/ cache: key: cache paths: - $CACHE_PATH/$CI_COMMIT_BRANCH/ - # - dep-cache/ - # - build-gcc-release/ - # - build-clang-debug/ - # - sphinx-cache/ - # - format-cache/ .build_any: script: - # - pwd -P - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - # - buildDir=build-$COMPILER_C-$BUILD_TYPE - # - cmake -B $CACHE_PATH/build-cl-release -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DHUB_BUILD_STATIC_LIBRARY=ON -DHUB_ENABLE_EXAMPLES=ON - mkdir -p $buildDir - # - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir $CMAKE_CONFIGURE_ARGS - - cmake -B $buildDir -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir $CMAKE_CONFIGURE_ARGS - # - !reference [.build_any, script] - # - cmake -B $CACHE_PATH/build-release -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DHUB_BUILD_STATIC_LIBRARY=ON -DHUB_ENABLE_EXAMPLES=ON - - cmake --build $buildDir --config $BUILD_TYPE --parallel + - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir $CMAKE_CONFIGURE_ARGS + - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) - cmake --install $buildDir --config $BUILD_TYPE - - -.test_any: - script: - - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin - # - cmake --build build-$COMPILER_C-$BUILD_TYPE --config $BUILD_TYPE --target tests - -############################################# -# fetch-win10: -# stage: fetch -# tags: -# - win10 +# .test_any: # script: -# - git fetch +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE +# - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin # -# fetch-linux: -# stage: fetch -# tags: -# - linux -# script: -# - git fetch -############################################# Linux +############################################# Builds ############################################ + +############################################# Linux (build) build-linux-clang-x64-release: stage: build @@ -95,9 +51,9 @@ build-linux-clang-x64-release: - COMPILER_CXX=clang++ - ARCHITECTURE=x64 - BUILD_TYPE=Release - - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON" + - CMAKE_CONFIGURE_ARGS="-DHUB_BUILD_DOC=ON" - !reference [.build_any, script] - + build-linux-gcc-x64-debug: stage: build tags: @@ -107,10 +63,9 @@ build-linux-gcc-x64-debug: - COMPILER_CXX=g++ - ARCHITECTURE=x64 - BUILD_TYPE=Debug - # - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON" - - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON" + - CMAKE_CONFIGURE_ARGS="" - !reference [.build_any, script] - + ############################################# Windows build-windows-cl-x64-release: @@ -122,7 +77,7 @@ build-windows-cl-x64-release: - COMPILER_CXX=cl - ARCHITECTURE=x64 - BUILD_TYPE=Release - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A $ARCHITECTURE" + - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" - !reference [.build_any, script] build-windows-cl-Win32-debug: @@ -134,68 +89,12 @@ build-windows-cl-Win32-debug: - COMPILER_CXX=cl - ARCHITECTURE=Win32 - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A $ARCHITECTURE" - - !reference [.build_any, script] - -build-windows-cl-x64-debug: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=x64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A $ARCHITECTURE" + - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" - !reference [.build_any, script] - only: - - master - -build-windows-cl-ARM64-debug: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=ARM64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A $ARCHITECTURE" - - !reference [.build_any, script] - only: - - master - -build-windows-cl-ARM-debug: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=ARM - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A $ARCHITECTURE" - - !reference [.build_any, script] - only: - - master -build-windows-cl-UWP_x64-debug: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=UWP-x64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0" - - !reference [.build_any, script] - only: - - master - -#################################### MacOs +############################################# MacOS (build) -build-macOs-clang-arm64-release: +build-macOs-clang-arm64-debug: stage: build tags: - $MACOS_TAG @@ -203,453 +102,162 @@ build-macOs-clang-arm64-release: - COMPILER_C=clang - COMPILER_CXX=clang++ - ARCHITECTURE=arm64 - - BUILD_TYPE=Release - # - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON" - - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON" + - BUILD_TYPE=Debug + - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - !reference [.build_any, script] - + build-macOs-llvm_gcc-arm64-debug: stage: build tags: - $MACOS_TAG script: - #- COMPILER_C=gcc - COMPILER_C=llvm-gcc - #- COMPILER_CXX=g++ - COMPILER_CXX=llvm-g++ - ARCHITECTURE=arm64 - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON" - - !reference [.build_any, script] - -build-macOs-clang-x86_64-debug: - stage: build - tags: - - $MACOS_TAG - script: - - COMPILER_C=clang - - COMPILER_CXX=clang++ - - ARCHITECTURE=x86_64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - # - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" + - CMAKE_CONFIGURE_ARGS="" - !reference [.build_any, script] - only: - - master - -build-macOs-clang-arm64-debug: - stage: build - tags: - - $MACOS_TAG - script: - - COMPILER_C=clang - - COMPILER_CXX=clang++ - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DHUB_ENABLE_TESTS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - # - CMAKE_CONFIGURE_ARGS="-DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DHUB_ENABLE_TESTS=ON -DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - - !reference [.build_any, script] - only: - - master - - - -############################################ TESTS - -test-linux-clang-x64-release: - stage: test - tags: - - $LINUX_TAG - script: - - COMPILER_C=clang - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - !reference [.test_any, script] - # when: manual - needs: - - job: build-linux-clang-x64-release - optional: true - -################### - - -test-linux-gcc-x64-debug: - stage: test - tags: - - $LINUX_TAG - script: - - COMPILER_C=gcc - - ARCHITECTURE=x64 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - # when: manual - needs: - - job: build-linux-gcc-x64-debug - optional: true - -############################################ DOS - - - -test-windows-cl-x64-release: - stage: test - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - !reference [.test_any, script] - # when: manual - needs: - - job: build-windows-cl-x64-release - optional: true - -################### - - -test-windows-cl-Win32-debug: - stage: test - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - ARCHITECTURE=Win32 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - # when: manual - needs: - - job: build-windows-cl-Win32-debug - optional: true - -############################################ MacOs - - -test-macOs-clang-arm64-release: - stage: test - tags: - - $MACOS_TAG - script: - - COMPILER_C=clang - - ARCHITECTURE=arm64 - - BUILD_TYPE=Release - - !reference [.test_any, script] - # when: manual - needs: - - job: build-macOs-clang-arm64-release - optional: true - -################### - - -test-macOs-llvm_gcc-arm64-debug: - stage: test - tags: - - $MACOS_TAG - script: - #- COMPILER_C=gcc - - COMPILER_C=llvm-gcc - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - # when: manual - needs: - - job: build-macOs-llvm_gcc-arm64-debug - optional: true - - - - - +############################################ TESTS ############################################## +############################################# Linux (test) -# build-cl-release: -# # stage: build-release -# stage: build -# # before_script: -# # - export PATH=$PATH:/opt/Qt/5.10.0/gcc_64/bin -# # parallel: -# # matrix: -# # - PLATFORM: [windows, linux] -# # - ARCH: [amd64, arm64, ppc64le] -# # +# test-linux-clang-x64-release: +# stage: test +# tags: +# - $LINUX_TAG +# script: +# - COMPILER_C=clang +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - !reference [.test_any, script] +# needs: +# - job: build-linux-clang-x64-release +# optional: true +# +# +# test-linux-gcc-x64-debug: +# stage: test # tags: -# - win10 +# - $LINUX_TAG # script: -# - mkdir -p $CACHE_PATH/build-release -# - cmake -B $CACHE_PATH/build-cl-release -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DHUB_BUILD_STATIC_LIBRARY=ON -DHUB_ENABLE_EXAMPLES=ON -# - cmake --build $CACHE_PATH/build-release --config Release --parallel -# - cmake --install $CACHE_PATH/build-release --config Release -# # only: -# # - $MASTER_BRANCH +# - COMPILER_C=gcc +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-linux-gcc-x64-debug +# optional: true # -# build-cl-debug: -# stage: build +# ############################################ DOS (test) +# +# test-windows-cl-x64-release: +# stage: test # tags: -# - win10 +# - $WIN_TAG # script: -# - mkdir -p $CACHE_PATH/build-debug -# - cmake -B $CACHE_PATH/build-gcc-debug -DCMAKE_CXX_COMPILER=cl -DCMAKE_C_COMPILER=cl -DCMAKE_BUILD_TYPE=Debug -DHUB_ENABLE_TESTS=ON -# - cmake --build $CACHE_PATH/build-debug --config Debug --parallel -# # only: -# # - $MASTER_BRANCH +# - COMPILER_C=cl +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - !reference [.test_any, script] +# needs: +# - job: build-windows-cl-x64-release +# optional: true # -# build-clang-release: -# stage: build +# test-windows-cl-Win32-debug: +# stage: test # tags: -# - linux +# - $WIN_TAG # script: -# - mkdir -p $CACHE_PATH/build-clang-release -# - cmake -B $CACHE_PATH/build-clang-release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DHUB_BUILD_STATIC_LIBRARY=ON -DHUB_ENABLE_EXAMPLES=ON -DHUB_BUILD_DOC=ON -# - cmake --build $CACHE_PATH/build-clang-release --config Release --parallel -# - cmake --install $CACHE_PATH/build-clang-release --config Release -# # only: -# # - $MASTER_BRANCH +# - COMPILER_C=cl +# - ARCHITECTURE=Win32 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-windows-cl-Win32-debug +# optional: true # -# build-gcc-debug: -# stage: build +# ############################################ MacOs (test) +# +# test-macOs-clang-arm64-debug: +# stage: test # tags: -# - linux +# - $MACOS_TAG # script: -# - mkdir -p $CACHE_PATH/build-gcc-debug -# - cmake -B $CACHE_PATH/build-gcc-debug -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_BUILD_TYPE=Debug -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_COVERAGE=ON -# - cmake --build $CACHE_PATH/build-gcc-debug --config Debug --parallel -# # only: -# # - $MASTER_BRANCH +# - COMPILER_C=clang +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-macOs-clang-arm64-debug +# optional: true # -# test: +# test-macOs-llvm_gcc-arm64-debug: # stage: test +# tags: +# - $MACOS_TAG # script: -# # - cd cache/build-gcc-debug/tests -# # - ctest -V -# - cmake --build $CACHE_PATH/build-gcc-debug --target tests -# # - ./runmytests.sh -# # only: -# # - $MASTER_BRANCH +# - COMPILER_C=llvm-gcc +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-macOs-llvm_gcc-arm64-debug +# optional: true # +############################################ Others ############################################## + # coverage: # stage: coverage +# tags: +# - $LINUX_TAG # script: -# -# # - cp -rT cache/dep-cache/ /; -# # - apt update -# # - apt install -y doxygen clang libclang-dev lcov -# # - cd build-gcc-release/ -# # - cmake --build cache/build-gcc-debug/ --target coverage -# - cmake --build $CACHE_PATH/build-gcc-debug --target coverage -# # - cache/node_modules/.bin/lcov-badge-generator cache/build-gcc-debug/coverage.capture -# # - cp badge.svg cache/build-gcc-debug/coverage/ -# # - mv $CACHE_PATH/build-gcc-debug/coverage-lcov public/ -# # artifacts: -# # paths: -# # - public -# # expire_in: 1 week -# # only: -# # - $MASTER_BRANCH -# -# cppCheck: -# stage: code-analysis +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-coverage + +cppCheck-linux-clang-x64-release: + stage: code-analysis + tags: + - $LINUX_TAG + script: + - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release + - cmake --build $buildDir --target hub-cppCheck + needs: + - job: test-linux-clang-x64-release + optional: true + +# format-linux-clang-x64-release: +# stage: format +# tags: +# - $LINUX_TAG # script: -# # - apt update -# # - apt install -y cppcheck -# # - cppcheck --enable=all --error-exitcode=1 src tests server -I src -I server/libServer/ --inline-suppr --suppress=toomanyconfigs --suppress=missingIncludeSystem --suppress=noValidConfiguration -# # - cppcheck --enable=all src server --error-exitcode=1 --suppress=unusedFunction --suppress=missingInclude -# - cmake --build ${CACHE_PATH}/build-clang-release --target cppCheck -# -# -# doc-doxygen: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-format +# - git diff --exit-code +# needs: +# - job: cppCheck-linux-clang-x64-release +# optional: true + +# doc-doxygen-linux-clang-x64-release: # stage: doc +# tags: +# - $LINUX_TAG # script: -# # - cp -rT cache/dep-cache/ /; -# -# # - cmake --build cache/build-clang-release --target docs -# - cmake --build $CACHE_PATH/build-clang-release --target doc-doxygen -# # - mv $CACHE_PATH/build-clang-release/doc/docs_doxygen/html/ public/ -# # - ./runmytests.sh -# # artifacts: -# # paths: -# # - public -# # expire_in: 1 week -# # only: -# # - feature/add-gitlab-pages-support -# # only: -# # - $MASTER_BRANCH -# -# # cache-sphinx: -# # stage: doc -# # script: -# # - |- -# # cd cache -# # cp -rT dep-cache/ /; -# # -# # # rm -rf sphinx-cache -# # if [ ! -e sphinx-cache ]; then -# # apt update -# # apt install -y python3-pip clang -# # pip3 install breathe sphinx sphinx-sitemap sphinx-rtd-theme -# # -# # mkdir -pv sphinx-cache/usr/local/bin/ -# # mkdir -pv sphinx-cache/usr/lib/ -# # mkdir -pv sphinx-cache/usr/bin/ -# # mkdir -pv sphinx-cache/usr/local/lib/ -# # mkdir -pv sphinx-cache/usr/lib/llvm-11/lib/ -# # mkdir -pv sphinx-cache/usr/lib/x86_64-linux-gnu/ -# # -# # cp -ar /usr/lib/python* sphinx-cache/usr/lib/ -# # cp -ar /usr/lib/clang* sphinx-cache/usr/lib/ -# # cp -a /usr/lib/x86_64-linux-gnu/libclang* sphinx-cache/usr/lib/x86_64-linux-gnu/ -# # cp -ra /usr/lib/llvm-11/lib/* sphinx-cache/usr/lib/llvm-11/lib/ -# # cp -a /usr/bin/python* sphinx-cache/usr/bin/ -# # cp /usr/local/bin/sphinx-build sphinx-cache/usr/local/bin/ -# # -# # cp -ar /usr/local/lib/python* sphinx-cache/usr/local/lib/ -# # fi -# # only: -# # - $MASTER_BRANCH -# -# -# doc-sphinx: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-doc-doxygen +# needs: +# - job: format-linux-clang-x64-release +# optional: true + +# doc-sphinx-linux-clang-x64-release: # stage: doc +# tags: +# - $LINUX_TAG # script: -# - |- -# # cp -rT cache/dep-cache/ /; -# # cp -rT cache/sphinx-cache/ /; -# -# # ls -la /usr/local/bin/sphinx-build -# # find / -name "sphinx-build" -# # echo $PATH -# -# # make -C doc/docs_sphinx html -# cmake --build $CACHE_PATH/build-clang-release --target doc-sphinx -# # mv doc/docs_sphinx/_build/html public/ -# # artifacts: -# # paths: -# # - public -# # expire_in: 1 week -# # only: -# # - $MASTER_BRANCH -# -# # cache-format: -# # stage: format -# # script: -# # - |- -# # cd cache -# # # rm -rf format-cache -# # if [ ! -e format-cache ]; then -# # apt update -# # apt install -y cmake-format clang-format -# # -# # mkdir -pv format-cache/usr/bin/ -# # mkdir -pv format-cache/usr/lib/llvm-11/bin/ -# # mkdir -pv format-cache/usr/lib/llvm-11/lib/ -# # mkdir -pv format-cache/usr/lib/x86_64-linux-gnu/ -# # -# # cp /usr/bin/cmake-format format-cache/usr/bin/ -# # cp /usr/bin/clang-format format-cache/usr/bin/ -# # cp /usr/bin/clang-format-11 format-cache/usr/bin/ -# # cp /usr/lib/llvm-11/bin/clang-format format-cache/usr/lib/llvm-11/bin/ -# # cp -a /usr/lib/x86_64-linux-gnu/libclang* format-cache/usr/lib/x86_64-linux-gnu/ -# # cp -ra /usr/lib/llvm-11/lib/* format-cache/usr/lib/llvm-11/lib/ -# # cp -a /usr/bin/python* format-cache/usr/bin/ -# # cp -ar /usr/lib/python* format-cache/usr/lib/ -# # fi -# # only: -# # - $MASTER_BRANCH -# -# format: -# stage: format -# script: -# - |- -# # cp -rT cache/format-cache/ /; -# -# # scripts/cleanup-project.sh -# cmake --build $CACHE_PATH/build-gcc-debug --target format -# git diff --exit-code -# only: -# - $MASTER_BRANCH +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-doc-sphinx +# needs: +# - job: doc-doxygen-linux-clang-x64-release +# optional: true # -# - -# before_script: -# - |- -# if [ ! -e cache ]; then -# mkdir cache -# fi -# cd cache - # - mkdir -pv cache - # - cd cache - # - rm -r apt-cache - # - mkdir -pv apt-cache - # - |- - # if [ -e apt-cache ]; then - # cp -rT apt-cache/ /; - # fi - # if [ -e sphinx-cache ]; then - # cp -rT sphinx-cache/ /; - # fi - # - find apt-cache - -# artifacts: -# # key: ${CI_COMMIT_REF_SLUG} -# expire_in: 30 days -# paths: -# # - build/_deps/ -# - build/ - -# dep: -# stage: dep -# script: -# - |- -# # rm -rf cache -# # rm -rf cache/build* -# if [ ! -e $CACHE_PATH ]; then -# mkdir $CACHE_PATH -# fi -# git fetch -# git status -# # cd $CACHE_PATH - # # rm -rf dep-cache - # # apt update - # # apt install -y npm - # if [ ! -e dep-cache ]; then - # apt update - # apt install -y doxygen clang libclang-dev lcov npm - # npm install lcov-badge-generator - # - # mkdir -pv dep-cache/usr/bin/ - # mkdir -pv dep-cache/usr/share/$(basename /usr/share/cmake-*)/Modules - # mkdir -pv dep-cache/usr/lib/x86_64-linux-gnu/ - # mkdir -pv dep-cache/usr/lib/llvm-11/lib/ - # mkdir -pv dep-cache/usr/lib/llvm-11/bin/ - # mkdir -pv dep-cache/etc/ - # - # cp /usr/bin/doxygen dep-cache/usr/bin/ - # cp /usr/share/cmake-*/Modules/FindDoxygen.cmake dep-cache/usr/share/$(basename /usr/share/cmake-*)/Modules/ - # cp -ar /usr/lib/clang* dep-cache/usr/lib/ - # cp -a /usr/lib/x86_64-linux-gnu/libclang* dep-cache/usr/lib/x86_64-linux-gnu/ - # cp -ra /usr/lib/llvm-11/lib/* dep-cache/usr/lib/llvm-11/lib/ - # cp -ar /usr/bin/clang* dep-cache/usr/bin/ - # cp -ar /usr/lib/llvm-11/bin/clang* dep-cache/usr/lib/llvm-11/bin/ - # cp /usr/bin/lcov dep-cache/usr/bin/ - # cp /usr/bin/genhtml dep-cache/usr/bin/ - # cp /usr/bin/geninfo dep-cache/usr/bin/ - # cp -a /usr/lib/x86_64-linux-gnu/perl* dep-cache/usr/lib/x86_64-linux-gnu/ - # cp -a /etc/perl dep-cache/etc/ - # cp -a /usr/share/perl* dep-cache/usr/share/ - # # fi - # # apt update - # # apt install -y npm - # cp /usr/bin/node dep-cache/usr/bin/ - # cp /usr/lib/x86_64-linux-gnu/libnode* dep-cache/usr/lib/x86_64-linux-gnu/ - # cp /usr/lib/x86_64-linux-gnu/libcares* dep-cache/usr/lib/x86_64-linux-gnu/ - # fi - # - # # fi - # # find dep-cache/usr/lib/x86_64-linux-gnu/perl/ - # # find / -name "gzip.pm" - # # ls dep-cache/usr/share/ - # # ls dep-cache/usr/share/* - # # only: - # # - $MASTER_BRANCH From c9bf02beeffb3c220ee177370d6dd6985447fe7f Mon Sep 17 00:00:00 2001 From: gauthier Date: Thu, 28 Mar 2024 16:02:16 +0100 Subject: [PATCH 02/10] [gitlab ci] fix cppCheck 2.10 on gitlab linux runner --- src/io/output/OutputStreamServer2.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/io/output/OutputStreamServer2.cpp b/src/io/output/OutputStreamServer2.cpp index 4230f100e..10a64f572 100644 --- a/src/io/output/OutputStreamServer2.cpp +++ b/src/io/output/OutputStreamServer2.cpp @@ -219,6 +219,8 @@ void OutputStreamServer2::startStreaming() { // Todo check if streamViewerInited is true before set to false data->m_streamViewerInited = false; + + // cppcheck-suppress knownConditionTrueFalse while ( !data->m_streamViewerInited ) { #ifdef DEBUG_OUTPUT_STREAM std::cout << "[OutputStream][Stream] waiting for stream viewer inited ..." From 022bb772c2c84cb33bc02aeb62ecc23acc25485a Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Mon, 25 Mar 2024 17:58:12 +0100 Subject: [PATCH 03/10] update CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 20c6d5c10..fba4947e0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,7 +7,6 @@ Current head v.2.1.0 rc - Code quality * cppcheck (2.7, 2.12) passed (#15) - Clean code - * Remove first server impl (#16) - CMake * Remove dead code (#15) * Install external headers due of inline headers (zpp_bits, serializer, std_any) (#34) @@ -17,6 +16,7 @@ Current head v.2.1.0 rc * Add github ci with build and install (#22) * Add issue templates for bug report and feature request (#29) * Add PULL_REQUEST_TEMPLATE file (#30) + * Updated gitlab config.yml with full pipeline - Tests * Fix timeout error on macos (#33) - Documentation From ced84ee589659a08477f8cda201b0f2654e78798 Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Mon, 22 Apr 2024 14:57:37 +0200 Subject: [PATCH 04/10] update ci + add doxygen check --- .gitlab-ci.yml | 220 ++++++++++++++++++++++++------------------------- 1 file changed, 109 insertions(+), 111 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1f38cd0a..374482216 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,9 @@ variables: stages: - build - # - test + - test # - coverage - - code-analysis - # - format + - code-quality # - doc cache: @@ -32,11 +31,11 @@ cache: - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) - cmake --install $buildDir --config $BUILD_TYPE -# .test_any: -# script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE -# - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin -# +.test_any: + script: + - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE + - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin + ############################################# Builds ############################################ @@ -66,7 +65,7 @@ build-linux-gcc-x64-debug: - CMAKE_CONFIGURE_ARGS="" - !reference [.build_any, script] -############################################# Windows +############################################# Windows (build) build-windows-cl-x64-release: stage: build @@ -123,101 +122,93 @@ build-macOs-llvm_gcc-arm64-debug: ############################################# Linux (test) -# test-linux-clang-x64-release: -# stage: test -# tags: -# - $LINUX_TAG -# script: -# - COMPILER_C=clang -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Release -# - !reference [.test_any, script] -# needs: -# - job: build-linux-clang-x64-release -# optional: true -# -# -# test-linux-gcc-x64-debug: -# stage: test -# tags: -# - $LINUX_TAG -# script: -# - COMPILER_C=gcc -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-linux-gcc-x64-debug -# optional: true -# -# ############################################ DOS (test) -# -# test-windows-cl-x64-release: -# stage: test -# tags: -# - $WIN_TAG -# script: -# - COMPILER_C=cl -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Release -# - !reference [.test_any, script] -# needs: -# - job: build-windows-cl-x64-release -# optional: true -# -# test-windows-cl-Win32-debug: -# stage: test -# tags: -# - $WIN_TAG -# script: -# - COMPILER_C=cl -# - ARCHITECTURE=Win32 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-windows-cl-Win32-debug -# optional: true -# +test-linux-clang-x64-release: + stage: test + tags: + - $LINUX_TAG + script: + - COMPILER_C=clang + - ARCHITECTURE=x64 + - BUILD_TYPE=Release + - !reference [.test_any, script] + needs: + - job: build-linux-clang-x64-release + optional: true + + +test-linux-gcc-x64-debug: + stage: test + tags: + - $LINUX_TAG + script: + - COMPILER_C=gcc + - ARCHITECTURE=x64 + - BUILD_TYPE=Debug + - !reference [.test_any, script] + needs: + - job: build-linux-gcc-x64-debug + optional: true + +# ############################################ Windows (test) + +test-windows-cl-x64-release: + stage: test + tags: + - $WIN_TAG + script: + - COMPILER_C=cl + - ARCHITECTURE=x64 + - BUILD_TYPE=Release + - !reference [.test_any, script] + needs: + - job: build-windows-cl-x64-release + optional: true + +test-windows-cl-Win32-debug: + stage: test + tags: + - $WIN_TAG + script: + - COMPILER_C=cl + - ARCHITECTURE=Win32 + - BUILD_TYPE=Debug + - !reference [.test_any, script] + needs: + - job: build-windows-cl-Win32-debug + optional: true + # ############################################ MacOs (test) -# -# test-macOs-clang-arm64-debug: -# stage: test -# tags: -# - $MACOS_TAG -# script: -# - COMPILER_C=clang -# - ARCHITECTURE=arm64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-macOs-clang-arm64-debug -# optional: true -# -# test-macOs-llvm_gcc-arm64-debug: -# stage: test -# tags: -# - $MACOS_TAG -# script: -# - COMPILER_C=llvm-gcc -# - ARCHITECTURE=arm64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-macOs-llvm_gcc-arm64-debug -# optional: true -# -############################################ Others ############################################## -# coverage: -# stage: coverage -# tags: -# - $LINUX_TAG -# script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-coverage +test-macOs-clang-arm64-debug: + stage: test + tags: + - $MACOS_TAG + script: + - COMPILER_C=clang + - ARCHITECTURE=arm64 + - BUILD_TYPE=Debug + - !reference [.test_any, script] + needs: + - job: build-macOs-clang-arm64-debug + optional: true + +test-macOs-llvm_gcc-arm64-debug: + stage: test + tags: + - $MACOS_TAG + script: + - COMPILER_C=llvm-gcc + - ARCHITECTURE=arm64 + - BUILD_TYPE=Debug + - !reference [.test_any, script] + needs: + - job: build-macOs-llvm_gcc-arm64-debug + optional: true + +############################################ Others ############################################## cppCheck-linux-clang-x64-release: - stage: code-analysis + stage: code-quality tags: - $LINUX_TAG script: @@ -227,6 +218,17 @@ cppCheck-linux-clang-x64-release: - job: test-linux-clang-x64-release optional: true +doc-doxygen-linux-clang-x64-release: + stage: code-quality + tags: + - $LINUX_TAG + script: + - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release + - cmake --build $buildDir --target hub-doc-doxygen + needs: + - job: cppCheck-linux-clang-x64-release + optional: true + # format-linux-clang-x64-release: # stage: format # tags: @@ -239,17 +241,6 @@ cppCheck-linux-clang-x64-release: # - job: cppCheck-linux-clang-x64-release # optional: true -# doc-doxygen-linux-clang-x64-release: -# stage: doc -# tags: -# - $LINUX_TAG -# script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-doc-doxygen -# needs: -# - job: format-linux-clang-x64-release -# optional: true - # doc-sphinx-linux-clang-x64-release: # stage: doc # tags: @@ -261,3 +252,10 @@ cppCheck-linux-clang-x64-release: # - job: doc-doxygen-linux-clang-x64-release # optional: true # +# coverage: +# stage: coverage +# tags: +# - $LINUX_TAG +# script: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-coverage From fcbe0a729d91ced88530d7bc4474821397185f17 Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Mon, 22 Apr 2024 15:01:44 +0200 Subject: [PATCH 05/10] update ci files --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 374482216..09e54af49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ cache: - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - mkdir -p $buildDir - - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir $CMAKE_CONFIGURE_ARGS + - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_EXAMPLES=ON $CMAKE_CONFIGURE_ARGS - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) - cmake --install $buildDir --config $BUILD_TYPE From 4007c50c9866ae566e49d7e1ce96a7745408fc66 Mon Sep 17 00:00:00 2001 From: gauthier Date: Thu, 2 May 2024 19:43:50 +0000 Subject: [PATCH 06/10] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09e54af49..b88d534e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ stages: - build - test # - coverage - - code-quality + # - code-quality # - doc cache: @@ -207,27 +207,27 @@ test-macOs-llvm_gcc-arm64-debug: ############################################ Others ############################################## -cppCheck-linux-clang-x64-release: - stage: code-quality - tags: - - $LINUX_TAG - script: - - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release - - cmake --build $buildDir --target hub-cppCheck - needs: - - job: test-linux-clang-x64-release - optional: true +# cppCheck-linux-clang-x64-release: +# stage: code-quality +# tags: +# - $LINUX_TAG +# script: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-cppCheck +# needs: +# - job: test-linux-clang-x64-release +# optional: true -doc-doxygen-linux-clang-x64-release: - stage: code-quality - tags: - - $LINUX_TAG - script: - - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release - - cmake --build $buildDir --target hub-doc-doxygen - needs: - - job: cppCheck-linux-clang-x64-release - optional: true +# doc-doxygen-linux-clang-x64-release: +# stage: code-quality +# tags: +# - $LINUX_TAG +# script: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# - cmake --build $buildDir --target hub-doc-doxygen +# needs: +# - job: cppCheck-linux-clang-x64-release +# optional: true # format-linux-clang-x64-release: # stage: format From 3402baf67c870969ce55e89f86ee81a7f5dad1d6 Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Thu, 2 May 2024 21:52:24 +0200 Subject: [PATCH 07/10] update gitlab ci --- .gitlab-ci.yml | 481 +++++++++++++++++++++++++------------------------ 1 file changed, 245 insertions(+), 236 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b88d534e4..fb42fabf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,261 +1,270 @@ +stages: +- build -variables: - CACHE_PATH: "cache16" - GIT_STRATEGY: fetch - LINUX_TAG: "linux" - WIN_TAG: "windows" - MACOS_TAG: "macOs" +include: +- local: /.gitlab/ci/build.gitlab-ci.yml + rules: + - if: '$CI_SERVER_HOST == "gitlab.com"' -# .branches_with_ci: - # only: - # - master -stages: - - build - - test - # - coverage - # - code-quality - # - doc -cache: - key: cache - paths: - - $CACHE_PATH/$CI_COMMIT_BRANCH/ - -.build_any: - script: - - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - - mkdir -p $buildDir - - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_EXAMPLES=ON $CMAKE_CONFIGURE_ARGS - - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) - - cmake --install $buildDir --config $BUILD_TYPE - -.test_any: - script: - - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE - - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin - - -############################################# Builds ############################################ - -############################################# Linux (build) - -build-linux-clang-x64-release: - stage: build - tags: - - $LINUX_TAG - script: - - COMPILER_C=clang - - COMPILER_CXX=clang++ - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - CMAKE_CONFIGURE_ARGS="-DHUB_BUILD_DOC=ON" - - !reference [.build_any, script] - -build-linux-gcc-x64-debug: - stage: build - tags: - - $LINUX_TAG - script: - - COMPILER_C=gcc - - COMPILER_CXX=g++ - - ARCHITECTURE=x64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="" - - !reference [.build_any, script] - -############################################# Windows (build) - -build-windows-cl-x64-release: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" - - !reference [.build_any, script] - -build-windows-cl-Win32-debug: - stage: build - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=Win32 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" - - !reference [.build_any, script] - -############################################# MacOS (build) - -build-macOs-clang-arm64-debug: - stage: build - tags: - - $MACOS_TAG - script: - - COMPILER_C=clang - - COMPILER_CXX=clang++ - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - - !reference [.build_any, script] - -build-macOs-llvm_gcc-arm64-debug: - stage: build - tags: - - $MACOS_TAG - script: - - COMPILER_C=llvm-gcc - - COMPILER_CXX=llvm-g++ - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="" - - !reference [.build_any, script] - - -############################################ TESTS ############################################## - -############################################# Linux (test) - -test-linux-clang-x64-release: - stage: test - tags: - - $LINUX_TAG - script: - - COMPILER_C=clang - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - !reference [.test_any, script] - needs: - - job: build-linux-clang-x64-release - optional: true - - -test-linux-gcc-x64-debug: - stage: test - tags: - - $LINUX_TAG - script: - - COMPILER_C=gcc - - ARCHITECTURE=x64 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - needs: - - job: build-linux-gcc-x64-debug - optional: true - -# ############################################ Windows (test) - -test-windows-cl-x64-release: - stage: test - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - !reference [.test_any, script] - needs: - - job: build-windows-cl-x64-release - optional: true - -test-windows-cl-Win32-debug: - stage: test - tags: - - $WIN_TAG - script: - - COMPILER_C=cl - - ARCHITECTURE=Win32 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - needs: - - job: build-windows-cl-Win32-debug - optional: true - -# ############################################ MacOs (test) - -test-macOs-clang-arm64-debug: - stage: test - tags: - - $MACOS_TAG - script: - - COMPILER_C=clang - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - needs: - - job: build-macOs-clang-arm64-debug - optional: true - -test-macOs-llvm_gcc-arm64-debug: - stage: test - tags: - - $MACOS_TAG - script: - - COMPILER_C=llvm-gcc - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - !reference [.test_any, script] - needs: - - job: build-macOs-llvm_gcc-arm64-debug - optional: true - -############################################ Others ############################################## - -# cppCheck-linux-clang-x64-release: -# stage: code-quality +# variables: +# CACHE_PATH: "cache16" +# GIT_STRATEGY: fetch +# LINUX_TAG: "linux" +# WIN_TAG: "windows" +# MACOS_TAG: "macOs" +# +# # .branches_with_ci: +# # only: +# # - master +# +# stages: +# - build +# - test +# # - coverage +# # - code-quality +# # - doc +# +# cache: +# key: cache +# paths: +# - $CACHE_PATH/$CI_COMMIT_BRANCH/ +# +# .build_any: +# script: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE +# - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE +# - mkdir -p $buildDir +# - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_EXAMPLES=ON $CMAKE_CONFIGURE_ARGS +# - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) +# - cmake --install $buildDir --config $BUILD_TYPE +# +# .test_any: +# script: +# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE +# - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin +# +# +# ############################################# Builds ############################################ +# +# ############################################# Linux (build) +# +# build-linux-clang-x64-release: +# stage: build # tags: # - $LINUX_TAG # script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-cppCheck +# - COMPILER_C=clang +# - COMPILER_CXX=clang++ +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - CMAKE_CONFIGURE_ARGS="-DHUB_BUILD_DOC=ON" +# - !reference [.build_any, script] +# +# build-linux-gcc-x64-debug: +# stage: build +# tags: +# - $LINUX_TAG +# script: +# - COMPILER_C=gcc +# - COMPILER_CXX=g++ +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Debug +# - CMAKE_CONFIGURE_ARGS="" +# - !reference [.build_any, script] +# +# ############################################# Windows (build) +# +# build-windows-cl-x64-release: +# stage: build +# tags: +# - $WIN_TAG +# script: +# - COMPILER_C=cl +# - COMPILER_CXX=cl +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" +# - !reference [.build_any, script] +# +# build-windows-cl-Win32-debug: +# stage: build +# tags: +# - $WIN_TAG +# script: +# - COMPILER_C=cl +# - COMPILER_CXX=cl +# - ARCHITECTURE=Win32 +# - BUILD_TYPE=Debug +# - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" +# - !reference [.build_any, script] +# +# ############################################# MacOS (build) +# +# build-macOs-clang-arm64-debug: +# stage: build +# tags: +# - $MACOS_TAG +# script: +# - COMPILER_C=clang +# - COMPILER_CXX=clang++ +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" +# - !reference [.build_any, script] +# +# build-macOs-llvm_gcc-arm64-debug: +# stage: build +# tags: +# - $MACOS_TAG +# script: +# - COMPILER_C=llvm-gcc +# - COMPILER_CXX=llvm-g++ +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - CMAKE_CONFIGURE_ARGS="" +# - !reference [.build_any, script] +# +# +# ############################################ TESTS ############################################## +# +# ############################################# Linux (test) +# +# test-linux-clang-x64-release: +# stage: test +# tags: +# - $LINUX_TAG +# script: +# - COMPILER_C=clang +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - !reference [.test_any, script] # needs: -# - job: test-linux-clang-x64-release +# - job: build-linux-clang-x64-release # optional: true - -# doc-doxygen-linux-clang-x64-release: -# stage: code-quality +# +# +# test-linux-gcc-x64-debug: +# stage: test # tags: # - $LINUX_TAG # script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-doc-doxygen +# - COMPILER_C=gcc +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] # needs: -# - job: cppCheck-linux-clang-x64-release +# - job: build-linux-gcc-x64-debug # optional: true - -# format-linux-clang-x64-release: -# stage: format +# +# # ############################################ Windows (test) +# +# test-windows-cl-x64-release: +# stage: test # tags: -# - $LINUX_TAG +# - $WIN_TAG # script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-format -# - git diff --exit-code +# - COMPILER_C=cl +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - !reference [.test_any, script] # needs: -# - job: cppCheck-linux-clang-x64-release +# - job: build-windows-cl-x64-release # optional: true - -# doc-sphinx-linux-clang-x64-release: -# stage: doc +# +# test-windows-cl-Win32-debug: +# stage: test # tags: -# - $LINUX_TAG +# - $WIN_TAG # script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-doc-sphinx +# - COMPILER_C=cl +# - ARCHITECTURE=Win32 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] # needs: -# - job: doc-doxygen-linux-clang-x64-release +# - job: build-windows-cl-Win32-debug # optional: true # -# coverage: -# stage: coverage +# # ############################################ MacOs (test) +# +# test-macOs-clang-arm64-debug: +# stage: test # tags: -# - $LINUX_TAG +# - $MACOS_TAG # script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# - cmake --build $buildDir --target hub-coverage +# - COMPILER_C=clang +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-macOs-clang-arm64-debug +# optional: true +# +# test-macOs-llvm_gcc-arm64-debug: +# stage: test +# tags: +# - $MACOS_TAG +# script: +# - COMPILER_C=llvm-gcc +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - !reference [.test_any, script] +# needs: +# - job: build-macOs-llvm_gcc-arm64-debug +# optional: true +# +# ############################################ Others ############################################## +# +# # cppCheck-linux-clang-x64-release: +# # stage: code-quality +# # tags: +# # - $LINUX_TAG +# # script: +# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# # - cmake --build $buildDir --target hub-cppCheck +# # needs: +# # - job: test-linux-clang-x64-release +# # optional: true +# +# # doc-doxygen-linux-clang-x64-release: +# # stage: code-quality +# # tags: +# # - $LINUX_TAG +# # script: +# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# # - cmake --build $buildDir --target hub-doc-doxygen +# # needs: +# # - job: cppCheck-linux-clang-x64-release +# # optional: true +# +# # format-linux-clang-x64-release: +# # stage: format +# # tags: +# # - $LINUX_TAG +# # script: +# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# # - cmake --build $buildDir --target hub-format +# # - git diff --exit-code +# # needs: +# # - job: cppCheck-linux-clang-x64-release +# # optional: true +# +# # doc-sphinx-linux-clang-x64-release: +# # stage: doc +# # tags: +# # - $LINUX_TAG +# # script: +# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# # - cmake --build $buildDir --target hub-doc-sphinx +# # needs: +# # - job: doc-doxygen-linux-clang-x64-release +# # optional: true +# # +# # coverage: +# # stage: coverage +# # tags: +# # - $LINUX_TAG +# # script: +# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release +# # - cmake --build $buildDir --target hub-coverage From d24bd42d88ff0def21b256081297600786310247 Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Thu, 2 May 2024 21:55:29 +0200 Subject: [PATCH 08/10] add .gitlab dir --- .gitlab/ci/build.gitlab-ci.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .gitlab/ci/build.gitlab-ci.yml diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml new file mode 100644 index 000000000..1d330694e --- /dev/null +++ b/.gitlab/ci/build.gitlab-ci.yml @@ -0,0 +1,27 @@ + +binaries: + # extends: + # - .rules:merge_request_pipelines:no_docs + # - .go-cache + stage: build + # needs: + # - 'prepare done' + script: + - uname -a + # artifacts: + # paths: + # - out/binaries/gitlab-runner-* + # exclude: + # - out/binaries/gitlab-runner-helper/ + # expire_in: 7d + parallel: + matrix: + - PLATFORMS: + - linux/amd64 linux/arm64 #64bit + - linux/386 linux/arm #32bit + - linux/s390x linux/ppc64le #ibm + - linux/riscv64 #riscv + - darwin/amd64 darwin/arm64 + - freebsd/386 freebsd/amd64 freebsd/arm + - windows/386 windows/amd64 + From 5218c6caf1ca6ab40c75fd06df86576e32dae05a Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Thu, 2 May 2024 22:16:31 +0200 Subject: [PATCH 09/10] update gitlab ci --- .gitlab-ci.yml | 318 ++++++++++----------------------- .gitlab/ci/build.gitlab-ci.yml | 27 --- 2 files changed, 91 insertions(+), 254 deletions(-) delete mode 100644 .gitlab/ci/build.gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb42fabf6..00d92e2f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,69 +1,54 @@ + + +variables: + CACHE_PATH: "cache" + GIT_STRATEGY: fetch + LINUX_TAG: "linux" + WIN_TAG: "windows" + MACOS_TAG: "macos" + stages: -- build + - buildAndTest -include: -- local: /.gitlab/ci/build.gitlab-ci.yml - rules: - - if: '$CI_SERVER_HOST == "gitlab.com"' +cache: + key: cache + paths: + - $CACHE_PATH/$CI_COMMIT_BRANCH/ +.build_any: + script: + - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE + - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE + - mkdir -p $buildDir + - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_EXAMPLES=ON $CMAKE_CONFIGURE_ARGS + # - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) + - cmake --build $buildDir --config $BUILD_TYPE + - cmake --install $buildDir --config $BUILD_TYPE +.test_any: + script: + - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE + - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin + +############################################# Linux + +buildAndTest-linux-clang-x64-release: + stage: buildAndTest + tags: + - $LINUX_TAG + script: + - apt update + - apt install -y cmake clang + - COMPILER_C=clang + - COMPILER_CXX=clang++ + - ARCHITECTURE=x64 + - BUILD_TYPE=Release + - CMAKE_CONFIGURE_ARGS="" + - !reference [.build_any, script] + - !reference [.test_any, script] -# variables: -# CACHE_PATH: "cache16" -# GIT_STRATEGY: fetch -# LINUX_TAG: "linux" -# WIN_TAG: "windows" -# MACOS_TAG: "macOs" -# -# # .branches_with_ci: -# # only: -# # - master -# -# stages: -# - build -# - test -# # - coverage -# # - code-quality -# # - doc -# -# cache: -# key: cache -# paths: -# - $CACHE_PATH/$CI_COMMIT_BRANCH/ -# -# .build_any: -# script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE -# - installDir=$CACHE_PATH/$CI_COMMIT_BRANCH/install-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE -# - mkdir -p $buildDir -# - cmake -B $buildDir -DCMAKE_C_COMPILER=$COMPILER_C -DCMAKE_CXX_COMPILER=$COMPILER_CXX -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=$installDir -DHUB_ENABLE_TESTS=ON -DHUB_ENABLE_EXAMPLES=ON $CMAKE_CONFIGURE_ARGS -# - cmake --build $buildDir --config $BUILD_TYPE --parallel -j $(expr $(nproc --all) - 1) -# - cmake --install $buildDir --config $BUILD_TYPE -# -# .test_any: -# script: -# - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-$ARCHITECTURE-$COMPILER_C-$BUILD_TYPE -# - cmake --build $buildDir --config $BUILD_TYPE --target hub-tests-bin -# -# -# ############################################# Builds ############################################ -# -# ############################################# Linux (build) -# -# build-linux-clang-x64-release: -# stage: build -# tags: -# - $LINUX_TAG -# script: -# - COMPILER_C=clang -# - COMPILER_CXX=clang++ -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Release -# - CMAKE_CONFIGURE_ARGS="-DHUB_BUILD_DOC=ON" -# - !reference [.build_any, script] -# # build-linux-gcc-x64-debug: -# stage: build +# stage: buildAndTest # tags: # - $LINUX_TAG # script: @@ -73,23 +58,26 @@ include: # - BUILD_TYPE=Debug # - CMAKE_CONFIGURE_ARGS="" # - !reference [.build_any, script] -# -# ############################################# Windows (build) -# -# build-windows-cl-x64-release: -# stage: build -# tags: -# - $WIN_TAG -# script: -# - COMPILER_C=cl -# - COMPILER_CXX=cl -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Release -# - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" -# - !reference [.build_any, script] -# +# - !reference [.test_any, script] + +############################################# Windows + +build-windows-cl-x64-release: + stage: buildAndTest + tags: + - $WIN_TAG + script: + # - apt update + # - apt install -y cmake clang + - COMPILER_C=cl + - COMPILER_CXX=cl + - ARCHITECTURE=x64 + - BUILD_TYPE=Release + - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" + - !reference [.build_any, script] + # build-windows-cl-Win32-debug: -# stage: build +# stage: buildAndTest # tags: # - $WIN_TAG # script: @@ -99,23 +87,25 @@ include: # - BUILD_TYPE=Debug # - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" # - !reference [.build_any, script] -# -# ############################################# MacOS (build) -# -# build-macOs-clang-arm64-debug: -# stage: build -# tags: -# - $MACOS_TAG -# script: -# - COMPILER_C=clang -# - COMPILER_CXX=clang++ -# - ARCHITECTURE=arm64 -# - BUILD_TYPE=Debug -# - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" -# - !reference [.build_any, script] -# -# build-macOs-llvm_gcc-arm64-debug: -# stage: build + +############################################# MacOS + +build-macos-clang-arm64-debug: + stage: buildAndTest + tags: + - $MACOS_TAG + script: + # - apt update + # - apt install -y cmake clang + - COMPILER_C=clang + - COMPILER_CXX=clang++ + - ARCHITECTURE=arm64 + - BUILD_TYPE=Debug + - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" + - !reference [.build_any, script] + +# build-macos-llvm_gcc-arm64-debug: +# stage: buildAndTest # tags: # - $MACOS_TAG # script: @@ -126,145 +116,19 @@ include: # - CMAKE_CONFIGURE_ARGS="" # - !reference [.build_any, script] # -# -# ############################################ TESTS ############################################## -# -# ############################################# Linux (test) -# -# test-linux-clang-x64-release: -# stage: test -# tags: -# - $LINUX_TAG -# script: -# - COMPILER_C=clang -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Release -# - !reference [.test_any, script] -# needs: -# - job: build-linux-clang-x64-release -# optional: true -# -# -# test-linux-gcc-x64-debug: -# stage: test + +# buildAndTest-linux-gcc-x64-release: +# stage: buildAndTest # tags: # - $LINUX_TAG # script: +# - apt update +# - apt install -y cmake gcc # - COMPILER_C=gcc -# - ARCHITECTURE=x64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-linux-gcc-x64-debug -# optional: true -# -# # ############################################ Windows (test) -# -# test-windows-cl-x64-release: -# stage: test -# tags: -# - $WIN_TAG -# script: -# - COMPILER_C=cl +# - COMPILER_CXX=g++ # - ARCHITECTURE=x64 # - BUILD_TYPE=Release +# - CMAKE_CONFIGURE_ARGS="" +# - !reference [.build_any, script] # - !reference [.test_any, script] -# needs: -# - job: build-windows-cl-x64-release -# optional: true -# -# test-windows-cl-Win32-debug: -# stage: test -# tags: -# - $WIN_TAG -# script: -# - COMPILER_C=cl -# - ARCHITECTURE=Win32 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-windows-cl-Win32-debug -# optional: true -# -# # ############################################ MacOs (test) -# -# test-macOs-clang-arm64-debug: -# stage: test -# tags: -# - $MACOS_TAG -# script: -# - COMPILER_C=clang -# - ARCHITECTURE=arm64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-macOs-clang-arm64-debug -# optional: true -# -# test-macOs-llvm_gcc-arm64-debug: -# stage: test -# tags: -# - $MACOS_TAG -# script: -# - COMPILER_C=llvm-gcc -# - ARCHITECTURE=arm64 -# - BUILD_TYPE=Debug -# - !reference [.test_any, script] -# needs: -# - job: build-macOs-llvm_gcc-arm64-debug -# optional: true -# -# ############################################ Others ############################################## -# -# # cppCheck-linux-clang-x64-release: -# # stage: code-quality -# # tags: -# # - $LINUX_TAG -# # script: -# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# # - cmake --build $buildDir --target hub-cppCheck -# # needs: -# # - job: test-linux-clang-x64-release -# # optional: true -# -# # doc-doxygen-linux-clang-x64-release: -# # stage: code-quality -# # tags: -# # - $LINUX_TAG -# # script: -# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# # - cmake --build $buildDir --target hub-doc-doxygen -# # needs: -# # - job: cppCheck-linux-clang-x64-release -# # optional: true -# -# # format-linux-clang-x64-release: -# # stage: format -# # tags: -# # - $LINUX_TAG -# # script: -# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# # - cmake --build $buildDir --target hub-format -# # - git diff --exit-code -# # needs: -# # - job: cppCheck-linux-clang-x64-release -# # optional: true # -# # doc-sphinx-linux-clang-x64-release: -# # stage: doc -# # tags: -# # - $LINUX_TAG -# # script: -# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# # - cmake --build $buildDir --target hub-doc-sphinx -# # needs: -# # - job: doc-doxygen-linux-clang-x64-release -# # optional: true -# # -# # coverage: -# # stage: coverage -# # tags: -# # - $LINUX_TAG -# # script: -# # - buildDir=$CACHE_PATH/$CI_COMMIT_BRANCH/build-x64-clang-Release -# # - cmake --build $buildDir --target hub-coverage diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml deleted file mode 100644 index 1d330694e..000000000 --- a/.gitlab/ci/build.gitlab-ci.yml +++ /dev/null @@ -1,27 +0,0 @@ - -binaries: - # extends: - # - .rules:merge_request_pipelines:no_docs - # - .go-cache - stage: build - # needs: - # - 'prepare done' - script: - - uname -a - # artifacts: - # paths: - # - out/binaries/gitlab-runner-* - # exclude: - # - out/binaries/gitlab-runner-helper/ - # expire_in: 7d - parallel: - matrix: - - PLATFORMS: - - linux/amd64 linux/arm64 #64bit - - linux/386 linux/arm #32bit - - linux/s390x linux/ppc64le #ibm - - linux/riscv64 #riscv - - darwin/amd64 darwin/arm64 - - freebsd/386 freebsd/amd64 freebsd/arm - - windows/386 windows/amd64 - From 1413b9dee99a93d6717e806ad6b4a6850060faf9 Mon Sep 17 00:00:00 2001 From: Gauthier Bouyjou Date: Thu, 2 May 2024 22:46:55 +0200 Subject: [PATCH 10/10] fix ci on gitlab.com --- .gitlab-ci.yml | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00d92e2f7..0947a180b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: GIT_STRATEGY: fetch LINUX_TAG: "linux" WIN_TAG: "windows" - MACOS_TAG: "macos" + MACOS_TAG: "saas-macos-medium-m1" stages: - buildAndTest @@ -62,20 +62,20 @@ buildAndTest-linux-clang-x64-release: ############################################# Windows -build-windows-cl-x64-release: - stage: buildAndTest - tags: - - $WIN_TAG - script: - # - apt update - # - apt install -y cmake clang - - COMPILER_C=cl - - COMPILER_CXX=cl - - ARCHITECTURE=x64 - - BUILD_TYPE=Release - - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" - - !reference [.build_any, script] - +# build-windows-cl-x64-release: +# stage: buildAndTest +# tags: +# - $WIN_TAG +# script: +# # - apt update +# # - apt install -y cmake clang +# - COMPILER_C=cl +# - COMPILER_CXX=cl +# - ARCHITECTURE=x64 +# - BUILD_TYPE=Release +# - CMAKE_CONFIGURE_ARGS="-A $ARCHITECTURE" +# - !reference [.build_any, script] +# # build-windows-cl-Win32-debug: # stage: buildAndTest # tags: @@ -90,19 +90,19 @@ build-windows-cl-x64-release: ############################################# MacOS -build-macos-clang-arm64-debug: - stage: buildAndTest - tags: - - $MACOS_TAG - script: - # - apt update - # - apt install -y cmake clang - - COMPILER_C=clang - - COMPILER_CXX=clang++ - - ARCHITECTURE=arm64 - - BUILD_TYPE=Debug - - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" - - !reference [.build_any, script] +# build-macos-clang-arm64-debug: +# stage: buildAndTest +# tags: +# - $MACOS_TAG +# script: +# # - apt update +# # - apt install -y cmake clang +# - COMPILER_C=clang +# - COMPILER_CXX=clang++ +# - ARCHITECTURE=arm64 +# - BUILD_TYPE=Debug +# - CMAKE_CONFIGURE_ARGS="-DCMAKE_OSX_ARCHITECTURES=$ARCHITECTURE" +# - !reference [.build_any, script] # build-macos-llvm_gcc-arm64-debug: # stage: buildAndTest