Skip to content

Commit 1ebb609

Browse files
committed
update packaging scripts to check git for last tag
1 parent bfaef01 commit 1ebb609

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

contrib/darwin/package.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ rm -rf build
1111
mkdir -p build
1212

1313
APPID="com.webmeshproj.app"
14-
VERSION=${VERSION:-0.0.2}
14+
VERSION=${VERSION}
1515
DAEMONROOT=${DAEMONROOT:-webmesh}
1616
SIGN=${SIGN:-"false"}
1717
SIGNER="${MAC_APP_SIGNER_NAME}"
@@ -20,6 +20,10 @@ NOTARIZATION_TEAMID="${MAC_NOTARIZATION_TEAMID}"
2020
NOTARIZATION_USERNAME="${MAC_NOTARIZATION_USERNAME}"
2121
NOTARIZATION_PASSWORD="${MAC_NOTARIZATION_PASSWORD}"
2222

23+
if [[ -z "${VERSION}" ]] ; then
24+
VERSION=$(git describe --tags --always --dirty | cut -d '-' -f 1)
25+
fi
26+
2327
echo "+ Building macOS installer for version $VERSION"
2428

2529
echo "++ Copying webmeshd to App directories"

contrib/windows/package.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $ErrorActionPreference = "Stop"
99

1010
$VERSION=$env:VERSION
1111
if (-not $version) {
12-
$VERSION = "0.0.2"
12+
$VERSION=((git describe --tags --always --dirty) -Split '-')[0]
1313
$env:VERSION=$VERSION
1414
}
1515

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webmesh",
3-
"version": "0.0.2",
3+
"version": "0.0.3",
44
"description": "An application for connecting to Webmesh networks",
55
"productName": "Webmesh",
66
"author": "Avi Zimmerman <avi.zimmerman@gmail.com>",

0 commit comments

Comments
 (0)