Skip to content

Commit

Permalink
Exclude install-release tags from git describe
Browse files Browse the repository at this point in the history
The install_release.sh script is updated one commit after the release
tag, which may be confusing.

For convenience, new lightweight tags have been added (for example
v2.5-install-release) to point to the commit where install_release.sh is
updated.

But these tags interfere with "git describe" to generate pretty
filenames when executing ./release.sh on a development branch, so ignore
them.

Before:

    release-v2.5-install-release-17-gc57a0512b

After:

    release-v2.5-18-gc57a0512b

Refs #4098 comment <#4098 (comment)>
  • Loading branch information
rom1v committed Jul 17, 2024
1 parent c57a051 commit bbcd763
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion release.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SERVER_BUILD_DIR := build-server
WIN32_BUILD_DIR := build-win32
WIN64_BUILD_DIR := build-win64

VERSION := $(shell git describe --tags --always)
VERSION := $(shell git describe --tags --exclude='*install-release' --always)

DIST := dist
WIN32_TARGET_DIR := scrcpy-win32-$(VERSION)
Expand Down

0 comments on commit bbcd763

Please sign in to comment.