The branch, master has been updated via 1305ec3ae64 .gitlab-ci: Allow a 1 hour to build Samba via b0b9663c80e .gitlab-ci: Ignore errors from missing source files in code coverage from 3f4660900a7 selftest: test tsocket_address_inet_from_hostport_strings
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1305ec3ae64e67fa68d3251d35f8a244a4a5be56 Author: Andrew Bartlett <abart...@samba.org> Date: Thu Sep 23 11:14:35 2021 +1200 .gitlab-ci: Allow a 1 hour to build Samba I have seen cases where the job is pushed to the private runners (which do not have the ccache) where this takes over 45mins, and a typical job can be 35 mins so this is too tight. Triggering the timeout causes a rebuild from scratch, which is done twice automatically, and is financially costly (we pay per VM start) and a waste of CPU/energy/etc. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14844 Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Oct 1 19:43:16 UTC 2021 on sn-devel-184 commit b0b9663c80e416bdbeae5af0b3e3977761ebb9ad Author: Andrew Bartlett <abart...@samba.org> Date: Thu Sep 23 11:06:13 2021 +1200 .gitlab-ci: Ignore errors from missing source files in code coverage This could happen when code coverage is collected from multiple distributions. Signed-off-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci-main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 8ad0034faa7..052618db5c5 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -169,7 +169,7 @@ others: .shared_template_build_only: extends: .shared_template - timeout: 45m + timeout: 1h artifacts: expire_in: 1 week paths: @@ -454,7 +454,7 @@ pages: - ls -la *.info - lcov $(ls *.info | xargs -I{} echo -n "-a {} ") -o all.info - ls -la *.info - - genhtml all.info --output-directory public --prefix=$(pwd) --title "coverage report for $CI_COMMIT_REF_NAME $CI_COMMIT_SHORT_SHA" + - genhtml all.info --ignore-errors source --output-directory public --prefix=$(pwd) --title "coverage report for $CI_COMMIT_REF_NAME $CI_COMMIT_SHORT_SHA" artifacts: expire_in: 30 days paths: -- Samba Shared Repository