From 29c308ae7382f3cca209d5f4831b25b67e7b5e01 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 14 Oct 2019 14:35:25 +0200 Subject: [PATCH] Makefile: Don't clobber an existing bots checkout Commit 4643afa58 was a thinko -- for our CI we *don't* want our test to clobber a pre-existing bots/ checkout, as we often use this to run tests against an updated image or to validate a changes to the bots project. On developer machines, bots may also be a symlink to an actual bots directory in development, so don't clobber that. Stop making "bots" a phony target, and drop the now unnecessary `[ -d bots ]` check. Adapted from https://github.com/cockpit-project/starter-kit/pull/232 --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9eadb838..93f5f004 100644 --- a/Makefile +++ b/Makefile @@ -173,14 +173,10 @@ vm-reset: # checkout Cockpit's bots for standard test VM images and API to launch them # must be from master, as only that has current and existing images; but testvm.py API is stable bots: - if [ ! -d bots ]; then \ - git clone --depth=1 https://github.com/cockpit-project/bots.git; \ - else \ - cd bots && git fetch && git reset --hard origin/master; \ - fi + git clone --depth=1 https://github.com/cockpit-project/bots.git .PHONY: ci_after_success ci_after_success: # nothing to do here, but Jenkins expects this to be present, otherwise fails -.PHONY: docs check test srpm vm vm-reset bots +.PHONY: docs check test srpm vm vm-reset