.gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit 7608a427558e54ec401e6f5600ee0e9f4cf6f392 Author: Sune Vuorela <s...@vuorela.dk> Date: Wed Mar 22 19:10:37 2023 +0100 CI: Use FDO_CI_CONCURRENT the freedesktop.org ci system suggests to not use more parallel jobs than whatever is put in that variable to avoid killing the systems. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93bf98c7..a1e95b1f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ build: - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data - mkdir -p build && cd build - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data .. - - ninja + - ninja -j ${FDO_CI_CONCURRENT} - ctest --output-on-failure build_clang14_libcpp: @@ -55,7 +55,7 @@ build_clang14_libcpp: - clang++-14 -fPIC -shared -o goostring-format-checker.so $srcdir/test/goostring-format-checker/goostring-format-checker.cc -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I /usr/lib/llvm-14/include/ - echo "We disable Qt6 tests since Qt6 exposes std::string in its ABI which makes it not build in this CI since we're using libc++ but Qt6 in debian is build with libstdc++" - CC=clang-14 CXX=clang++-14 cmake -G Ninja -DCMAKE_CXX_FLAGS="-stdlib=libc++ -Xclang -load -Xclang $PWD/goostring-format-checker.so -Xclang -add-plugin -Xclang goostring-format-checker -Werror -Wno-deprecated-declarations" -DTESTDATADIR=$srcdir/test-data -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DBUILD_QT6_TESTS=OFF $srcdir - - ninja + - ninja -j ${FDO_CI_CONCURRENT} - ctest --output-on-failure - echo "This is a complex way of not running clang-tidy over autogenerated files, unfortunately -DCMAKE_CXX_CLANG_TIDY doesn't support that https://gitlab.kitware.com/cmake/cmake/-/issues/19772" - cat compile_commands.json | jq '[.[] | select(.file | contains("'"$srcdir"'"))]' > compile_commands.aux.json @@ -101,7 +101,7 @@ build_clazy_clang14: - apt-get install --yes --no-install-recommends clazy clang-14 - mkdir -p build && cd build - CC=clang-14 CXX=clazy CXXFLAGS="-Werror -Wno-deprecated-declarations" cmake -G Ninja .. - - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja + - CLAZY_CHECKS="level0,level1,level2,isempty-vs-count,qhash-with-char-pointer-key,tr-non-literal,no-non-pod-global-static" ninja -j ${FDO_CI_CONCURRENT} build_android: stage: build @@ -121,7 +121,7 @@ build_android: -DENABLE_BOOST=OFF -DCMAKE_CXX_FLAGS="-Werror -Wno-deprecated-declarations" -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake' - - ninja + - ninja -j ${FDO_CI_CONCURRENT} qt5_docs: only: @@ -172,7 +172,7 @@ glib_docs: - apt-get install --yes --no-install-recommends gtk-doc-tools - mkdir -p build && cd build - cmake -G Ninja -DENABLE_GTK_DOC=YES .. - - ninja glib-docs + - ninja -j ${FDO_CI_CONCURRENT} glib-docs cache: {} artifacts: paths: