Merge pull request #118 from lorengordon/pin-makefile

plus3it · Dec 29, 2020 · 5656361 · 5656361
2 parents 5a2b773 + 4aefdf9
commit 5656361
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.0
+current_version = 0.6.1
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/bootstrap/Makefile.bootstrap b/bootstrap/Makefile.bootstrap
@@ -1,7 +1,7 @@
 export SHELL = /bin/bash
 export TARDIGRADE_CI_ORG ?= plus3it
 export TARDIGRADE_CI_PROJECT ?= tardigrade-ci
-export TARDIGRADE_CI_BRANCH ?= master
+export TARDIGRADE_CI_BRANCH ?= $(or $(shell grep 'FROM $(TARDIGRADE_CI_ORG)/$(TARDIGRADE_CI_PROJECT)' Dockerfile | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' 2> /dev/null),master)
 export TARDIGRADE_CI_PATH ?= $(shell until [ -d "$(TARDIGRADE_CI_PROJECT)" ] || [ "`pwd`" == '/' ]; do cd ..; done; pwd)/$(TARDIGRADE_CI_PROJECT)
 
 -include $(TARDIGRADE_CI_PATH)/Makefile

diff --git a/bootstrap/bin/install.sh b/bootstrap/bin/install.sh
@@ -12,4 +12,4 @@ fi
 
 echo "Cloning ${GITHUB_REPO}#${TARDIGRADE_CI_BRANCH}..."
 
-git clone -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"
+git clone -c advice.detachedHead=false --depth=1 -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ fi

		echo "Cloning ${GITHUB_REPO}#${TARDIGRADE_CI_BRANCH}..."

		git clone -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"
		git clone -c advice.detachedHead=false --depth=1 -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"