From d46ebbb76d91525416bede8feaa2e8ebf9ee6f60 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 1 Oct 2019 22:40:32 +0200 Subject: [PATCH] Makefile: Don't clobber an existing bots checkout Commit 95b2aff0 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. --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 061ce0c..31f7c5d 100644 --- a/Makefile +++ b/Makefile @@ -136,11 +136,7 @@ check: $(NODE_MODULES_TEST) $(VM_IMAGE) test/common # 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 + [ -d bots ] || git clone --depth=1 https://github.com/cockpit-project/bots.git # checkout Cockpit's test API; this has no API stability guarantee, so check out a stable tag # when you start a new project, use the latest relese, and update it from time to time