mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-25 09:05:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'generate-version-handle-repo-not-having-any-tags'

Browse source
This commit is contained in:
Daniel Eklöf 2021-10-11 20:27:05 +02:00
commit 75533e01b5
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.woodpecker.yml
View file

@ -1,8 +1,3 @@
clone:
git:
image: plugins/git
tags: true
pipeline: pipeline:
codespell: codespell:
when: { branch: master } when: { branch: master }
@ -42,6 +37,8 @@ pipeline:
- meson --buildtype=debug -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../.. - meson --buildtype=debug -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../..
- ninja -v -k0 - ninja -v -k0
- ninja -v test - ninja -v test
- ./foot --version
- ./footclient --version
- cd ../.. - cd ../..
# Release # Release
@ -50,6 +47,8 @@ pipeline:
- meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../.. - meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../..
- ninja -v -k0 - ninja -v -k0
- ninja -v test - ninja -v test
- ./foot --version
- ./footclient --version
- cd ../.. - cd ../..
# no grapheme clustering # no grapheme clustering
@ -59,6 +58,8 @@ pipeline:
- meson --buildtype=debug -Dgrapheme-clustering=disabled -Dfcft:text-shaping=disabled -Dfcft:test-text-shaping=false ../.. - meson --buildtype=debug -Dgrapheme-clustering=disabled -Dfcft:text-shaping=disabled -Dfcft:test-text-shaping=false ../..
- ninja -v -k0 - ninja -v -k0
- ninja -v test - ninja -v test
- ./foot --version
- ./footclient --version
- cd ../.. - cd ../..
x86: x86:
@ -80,6 +81,8 @@ pipeline:
- meson --buildtype=debug -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../.. - meson --buildtype=debug -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../..
- ninja -v -k0 - ninja -v -k0
- ninja -v test - ninja -v test
- ./foot --version
- ./footclient --version
- cd ../.. - cd ../..
# Release # Release
@ -88,4 +91,6 @@ pipeline:
- meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../.. - meson --buildtype=release -Dgrapheme-clustering=enabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true ../..
- ninja -v -k0 - ninja -v -k0
- ninja -v test - ninja -v test
- ./foot --version
- ./footclient --version
- cd ../.. - cd ../..

9
generate-version.sh
View file

@ -13,7 +13,14 @@ out_file=${3}
if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then
workdir=$(pwd) workdir=$(pwd)
cd "${src_dir}" 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) git_branch=$(git rev-parse --abbrev-ref HEAD)
cd "${workdir}" cd "${workdir}"