From 960a64691fbfe22732819912da9e50fadb6369da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jul 2020 12:17:15 +0200 Subject: [PATCH 1/2] semaphore: pull in tree explicitly semaphoreci was failing with: Can't exec "tree": No such file or directory at /tmp/autopkgtest-lxc.v9oand4g/downtmp/build.TIm/src/test/udev-test.pl line 1752. https://semaphoreci.com/systemd/systemd/branches/pull-request-16551/builds/1 --- semaphoreci/semaphore-runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/semaphoreci/semaphore-runner.sh b/semaphoreci/semaphore-runner.sh index 6864a137b1..897b398df9 100755 --- a/semaphoreci/semaphore-runner.sh +++ b/semaphoreci/semaphore-runner.sh @@ -37,7 +37,7 @@ apt-get -q --allow-releaseinfo-change update apt-get -y dist-upgrade apt-get install -y eatmydata # The following four are needed as long as these deps are not covered by Debian's own packaging -apt-get install -y fdisk libfdisk-dev libp11-kit-dev libssl-dev libpwquality-dev +apt-get install -y fdisk tree libfdisk-dev libp11-kit-dev libssl-dev libpwquality-dev apt-get purge --auto-remove -y unattended-upgrades systemctl unmask systemd-networkd systemctl enable systemd-networkd From 0390b094f5854f5f79fd945932373235dc607648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 23 Jul 2020 12:23:58 +0200 Subject: [PATCH 2/2] meson: do not choke on time epoch when there are no git tags github ci was failing with: meson.build:685:16: ERROR: String '' cannot be converted to int --- meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 0c0e1343c1..dbbddb68e2 100644 --- a/meson.build +++ b/meson.build @@ -676,17 +676,17 @@ conf.set_quoted('DEFAULT_NET_NAMING_SCHEME', default_net_naming_scheme) time_epoch = get_option('time-epoch') if time_epoch == -1 - source_date_epoch = run_command('sh', ['-c', 'echo "$SOURCE_DATE_EPOCH"']).stdout().strip() - if source_date_epoch != '' - time_epoch = source_date_epoch.to_int() - elif git.found() and run_command('test', '-e', '.git').returncode() == 0 + time_epoch = run_command('sh', ['-c', 'echo "$SOURCE_DATE_EPOCH"']).stdout().strip() + if time_epoch == '' and git.found() and run_command('test', '-e', '.git').returncode() == 0 # If we're in a git repository, use the creation time of the latest git tag. latest_tag = run_command('git', 'describe', '--abbrev=0', '--tags').stdout().strip() - time_epoch = run_command('git', 'log', '-1', '--format=%at', latest_tag).stdout().to_int() - else - NEWS = files('NEWS') - time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout().to_int() + time_epoch = run_command('git', 'log', '-1', '--format=%at', latest_tag).stdout() endif + if time_epoch == '' + NEWS = files('NEWS') + time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() + endif + time_epoch = time_epoch.to_int() endif conf.set('TIME_EPOCH', time_epoch)