diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-10-11 18:11:41 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-10-11 18:11:41 +0000 |
| commit | 7d30bccad86634518045e52c62dab2d512524770 (patch) | |
| tree | 4c5e9f34d66184216fa65a40f6273b2bcdd33b26 | |
| parent | ci: limit builds to the master branch (and pulls targeting it) (diff) | |
generate-version: handle git repo not having any tags
| -rw-r--r-- | .woodpecker.yml | 5 | ||||
| -rwxr-xr-x | generate-version.sh | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.woodpecker.yml b/.woodpecker.yml index dd0ef7da..50c5b14d 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 3ea55ba9..369f36ed 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}" |
