diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-07-23 15:24:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 15:24:46 +0200 |
| commit | 402e1e699f9fe39cdb1a6759cebe5475f9afcb96 (patch) | |
| tree | ea5c8273d6eaf5eb40bd4fc51d368e70692bbe1b | |
| parent | 495454f40f3e9eb7c9ce94b25cd4a8c67a5eb7e6 (diff) | |
| parent | 0390b094f5854f5f79fd945932373235dc607648 (diff) | |
| download | systemd-402e1e699f9fe39cdb1a6759cebe5475f9afcb96.tar.gz | |
Merge pull request #16557 from keszybz/two-ci-fixes
Two ci fixes
| -rw-r--r-- | meson.build | 14 | ||||
| -rwxr-xr-x | semaphoreci/semaphore-runner.sh | 2 |
2 files 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 + 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().to_int() + time_epoch = run_command(stat, '-c', '%Y', NEWS).stdout() endif + time_epoch = time_epoch.to_int() endif conf.set('TIME_EPOCH', time_epoch) 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 |