From 9a1371b96a4bb7f5bddb65d48d9d4db8063e3eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Mon, 11 Oct 2021 20:21:00 +0200 Subject: [PATCH] generate-version: handle git repo not having any tags --- .woodpecker.yml | 5 ----- generate-version.sh | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5f95979..294bee2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,8 +1,3 @@ -clone: - git: - image: plugins/git - tags: true - pipeline: codespell: when: { branch: master } diff --git a/generate-version.sh b/generate-version.sh index 458f4a1..8ac3b03 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -13,7 +13,14 @@ out_file=${3} if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then workdir=$(pwd) cd "${src_dir}" - git_version=$(git describe --always --tags) + + if git describe --tags > /dev/null 2>&1; then + git_version=$(git describe --always --tags) + else + # No tags available, happens in e.g. CI builds + git_version="${default_version}" + fi + git_branch=$(git rev-parse --abbrev-ref HEAD) cd "${workdir}"