Skip to content

Commit 676af18

Browse files
authored
Merge pull request #100 from lightninglabs/release-script-fix
script+version: fix to prepare for v0.2.0-alpha release
2 parents ca3d65a + 48e7e5d commit 676af18

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

scripts/release.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,9 @@ function check_tag_correct() {
109109
tapd_version="v${BASH_REMATCH[1]}"
110110
green "version: $tapd_version"
111111

112-
# If tag contains a release candidate suffix, append this suffix to the
113-
# tapd reported version before we compare.
114-
RC_REGEX="-rc[0-9]+$"
115-
if [[ $tag =~ $RC_REGEX ]]; then
116-
tapd_version+=${BASH_REMATCH[0]}
117-
fi
112+
# If the tapd reported version contains a suffix, remove it, so we can match
113+
# the tag properly.
114+
tapd_version=$(echo "$tapd_version" | sed -e 's/-\(alpha\|beta\)\(\.rc[0-9]\+\)\?//g')
118115

119116
# Match git tag with tapd version.
120117
if [[ $tag != "${tapd_version}" ]]; then

version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const (
4949

5050
// AppPreRelease MUST only contain characters from semanticAlphabet
5151
// per the semantic versioning spec.
52-
AppPreRelease = "alpha.rc1"
52+
AppPreRelease = "alpha"
5353

5454
// defaultAgentName is the default name of the software that is added as
5555
// the first part of the user agent string.

0 commit comments

Comments
 (0)