The branch, master has been updated via 9b1e96197e0 script/autobuild.py: allow write_system_info commands to fail via 0312a10e09d script/autobuild.py: use more portable 'cp -R -a -l' via f9374d0a4ec script/autobuild.py: add support git worktree via 579c27fc4aa .gitlab-ci.yml: actually run ubuntu2004-samba-o3 from 24b03fd28ed s3/utils: Fix double free error with smbtree
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9b1e96197e0983a16e73ce351eac7775801736d8 Author: Stefan Metzmacher <me...@samba.org> Date: Fri Feb 28 00:00:08 2020 +0100 script/autobuild.py: allow write_system_info commands to fail These commands are just there as hints to debug possible problems. In order to support autobuild.py on non-linux platforms we should just ignore errors here. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Thu Apr 2 07:36:07 UTC 2020 on sn-devel-184 commit 0312a10e09d8dc1295a4a80493761e91031e88e7 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 27 23:59:00 2020 +0100 script/autobuild.py: use more portable 'cp -R -a -l' On platforms like FreeBSD 12 cp doesn't accept the long options, using the one letter options works there and keeps working on Linux as well. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit f9374d0a4ecc11acc46884feec28d138accc6dab Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 27 23:58:42 2020 +0100 script/autobuild.py: add support git worktree .git is not always a directory, with 'git worktree' it's a file. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> commit 579c27fc4aafe5cbed6f4431f9a6230696c21611 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Apr 2 00:22:26 2020 +0200 .gitlab-ci.yml: actually run ubuntu2004-samba-o3 Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> ----------------------------------------------------------------------- Summary of changes: .gitlab-ci.yml | 2 +- script/autobuild.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 27a8dea47c1..ef44a3d9d89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -274,7 +274,7 @@ ubuntu1804-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu1804 -.ubuntu2004-samba-o3: +ubuntu2004-samba-o3: extends: .samba-o3-template image: $SAMBA_CI_CONTAINER_IMAGE_ubuntu2004 diff --git a/script/autobuild.py b/script/autobuild.py index 3889d6ed620..8cee3ecbbbf 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -37,7 +37,7 @@ def find_git_root(): '''get to the top of the git repo''' p = os.getcwd() while p != '/': - if os.path.isdir(os.path.join(p, ".git")): + if os.path.exists(os.path.join(p, ".git")): return p p = os.path.abspath(os.path.join(p, '..')) return None @@ -836,7 +836,7 @@ class builder(object): run_cmd("rm -rf %s" % self.test_source_dir) run_cmd("rm -rf %s" % self.prefix) if cp: - run_cmd("cp --recursive --link --archive %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) + run_cmd("cp -R -a -l %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) else: run_cmd("git clone --recursive --shared %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) self.start_next() @@ -967,7 +967,10 @@ class buildlist(object): 'cc --version', 'df -m .', 'df -m %s' % testbase]: - out = run_cmd(cmd, output=True, checkfail=False) + try: + out = run_cmd(cmd, output=True, checkfail=False) + except subprocess.CalledProcessError as e: + out = "<failed: %s>" % str(e) print('### %s' % cmd, file=f) print(out, file=f) print(file=f) -- Samba Shared Repository