Skip to content

Commit

Permalink
Use lightweight tags in git describe (#374)
Browse files Browse the repository at this point in the history
GitHub actions doesn't seem to trigger releases on
annotated tags, so add the --tags flag to the calls
to git describe so that it honors lightweight tags.
  • Loading branch information
ob authored Oct 16, 2019
1 parent d578177 commit 61c6eec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/bluepill.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bluepill_build()
}
set +o pipefail
# package bluepill
TAG=$(git describe --always)
TAG=$(git describe --always --tags)
DST="Bluepill-$TAG"
mkdir -p build/$DST/bin
cp build/Build/Products/Release/{bp,bluepill} build/$DST/bin
Expand Down
2 changes: 1 addition & 1 deletion scripts/bpversion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

OUT_FILE=$1
REPO_ROOT=$(git rev-parse --show-toplevel)
VERSION=$(git describe --always)
VERSION=$(git describe --always --tags)
test -z "$VERSION" && VERSION=$(cat "$REPO_ROOT/VERSION")
echo "#define BP_VERSION \"$VERSION\"" > "$OUT_FILE"
XCODE_VERSION=$(xcodebuild -version | awk 'BEGIN {OFS="";} /Xcode/ {version=$2} /Build version/ {build=$3} END {print version, " (", build, ")";}')
Expand Down

0 comments on commit 61c6eec

Please sign in to comment.