Move git operations earlier on script

Git operations need to be performed outside docker.

Signed-off-by: Daniel Finimundi <daniel@finimundi.com>

build-docker.sh

@@ -58,6 +58,9 @@ fi
 
 # Ensure the Git Hash is recorded before entering the docker container
 GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
+LAST_VERSION="$(git describe --tags --abbrev=0 --match="v[0-9].[0-9].[0-9]*")"
+LAST_VERSION_HASH="$(git rev-parse "${LAST_VERSION}")"
+COMMITS_FROM_LAST="$(git log --oneline "${LAST_VERSION}"..${GIT_HASH})"
 
 CONTAINER_EXISTS=$(${DOCKER} ps -a --filter name="${CONTAINER_NAME}" -q)
 CONTAINER_RUNNING=$(${DOCKER} ps --filter name="${CONTAINER_NAME}" -q)
@@ -95,6 +98,9 @@ if [ "${CONTAINER_EXISTS}" != "" ]; then
 		${PIGEN_DOCKER_OPTS} \
 		--volume "${CONFIG_FILE}":/config:ro \
 		-e "GIT_HASH=${GIT_HASH}" \
+		-e "LAST_VERSION=${LAST_VERSION}" \
+		-e "LAST_VERSION_HASH=${LAST_VERSION_HASH}" \
+		-e "COMMITS_FROM_LAST=${COMMITS_FROM_LAST}" \
 		--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
@@ -113,6 +119,9 @@ else
 		${PIGEN_DOCKER_OPTS} \
 		--volume "${CONFIG_FILE}":/config:ro \
 		-e "GIT_HASH=${GIT_HASH}" \
+		-e "LAST_VERSION=${LAST_VERSION}" \
+		-e "LAST_VERSION_HASH=${LAST_VERSION_HASH}" \
+		-e "COMMITS_FROM_LAST=${COMMITS_FROM_LAST}" \
 		pi-gen \
 		bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
 	# binfmt_misc is sometimes not mounted with debian bullseye image

build.sh

@@ -235,6 +235,9 @@ export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-Europe/London}"
 export GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"}
 
 export VERSION_BUMP=${VERSION_BUMP:-auto}
+export LAST_VERSION=${LAST_VERSION:-"$(git describe --tags --abbrev=0 --match="v[0-9].[0-9].[0-9]*")"}
+export LAST_VERSION_HASH=${LAST_VERSION_HASH:-"$(git rev-parse "${LAST_VERSION}")"}
+export COMMITS_FROM_LAST=${COMMITS_FROM_LAST:-"$(git log --oneline "${LAST_VERSION}"..${GIT_HASH})"}
 
 export PUBKEY_SSH_FIRST_USER
 

export-image/04-finalise/01-run.sh

@@ -83,7 +83,7 @@ cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
 	dpkg -l --root "$ROOTFS_DIR"
 } >> "$INFO_FILE"
 
-new_version=$("${SCRIPT_DIR}/update_version.sh" "${VERSION_BUMP}")
+new_version=$(source "${SCRIPT_DIR}/update_version.sh" "${VERSION_BUMP}")
 echo "VERSION=${new_version}" > "${ROOTFS_DIR}/etc/wlanpi-release"
 echo "::set-output name=version::${new_version}"
 

scripts/update_version.sh

@@ -7,7 +7,7 @@ setup_version() {
 	return 0
     fi
 
-    wget -O /tmp/semver \
+    wget -q -O /tmp/semver \
 	https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver
     chmod +x /tmp/semver
 }
@@ -21,9 +21,9 @@ get_latest_tag() {
 update_version() {
     setup_version
 
-    last_version="$(get_latest_tag)"
-    if [ "$(git rev-parse "${latest_version}") == "$(git rev-parse HEAD) ]; then
-	echo "v${latest_version}"
+    last_version="${LAST_VERSION}"
+    if [ "${GIT_HASH}" == "${LAST_VERSION_HASH}" ]; then
+	echo "${last_version}"
 	exit 0
     fi
 
@@ -36,7 +36,7 @@ update_version() {
 	patch) is_patch=1 ;;
 	*)
 	    # Guess the bump from commit history
-	    commits="$(git log --oneline "${last_version}"..HEAD)"
+	    commits="${COMMITS_FROM_LAST}"
 
 	    is_breaking="$(echo "${commits}" | awk '{ print $2; }' | { grep "BREAK:" || :; })"
 	    is_feature="$(echo "${commits}" | awk '{ print $2; }' | { grep "feat:" || :; })"