Skip to content

Commit 1f845e5

Browse files
committed
Fix to autobuild scripts, remove v from tag...
1 parent 79ce385 commit 1f845e5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/mcstas-autobuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
set -x
8282
cd McCode
8383
# Check if this is a clear-cut release-tag build:
84-
export REV=`git tag --points-at HEAD`
84+
export REV=`git tag --points-at HEAD | cut -b2-`
8585
# Otherwise, pick latest and add _nightly
8686
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
8787
echo Building on $RUNNER_OS with version set to $REV
@@ -97,7 +97,7 @@ jobs:
9797
set -x
9898
cd McCode
9999
# Check if this is a clear-cut release-tag build:
100-
export REV=`git tag --points-at HEAD`
100+
export REV=`git tag --points-at HEAD | cut -b2-`
101101
# Otherwise, pick latest and add _nightly
102102
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
103103
echo Building on $RUNNER_OS with version set to $REV
@@ -112,7 +112,7 @@ jobs:
112112
set -x
113113
cd McCode
114114
# Check if this is a clear-cut release-tag build:
115-
export REV=`git tag --points-at HEAD`
115+
export REV=`git tag --points-at HEAD | cut -b2-`
116116
# Otherwise, pick latest and add _nightly
117117
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
118118
echo Cross-compiling for MinGW Windows on $RUNNER_OS with version set to $REV

.github/workflows/mcxtrace-autobuild.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
set -x
8282
cd McCode
8383
# Check if this is a clear-cut release-tag build:
84-
export REV=`git tag --points-at HEAD`
84+
export REV=`git tag --points-at HEAD | cut -b2-`
8585
# Otherwise, pick latest and add _nightly
8686
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
8787
echo Building on $RUNNER_OS with version set to $REV
@@ -97,7 +97,7 @@ jobs:
9797
set -x
9898
cd McCode
9999
# Check if this is a clear-cut release-tag build:
100-
export REV=`git tag --points-at HEAD`
100+
export REV=`git tag --points-at HEAD | cut -b2-`
101101
# Otherwise, pick latest and add _nightly
102102
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
103103
echo Building on $RUNNER_OS with version set to $REV
@@ -112,7 +112,7 @@ jobs:
112112
set -x
113113
cd McCode
114114
# Check if this is a clear-cut release-tag build:
115-
export REV=`git tag --points-at HEAD`
115+
export REV=`git tag --points-at HEAD | cut -b2-`
116116
# Otherwise, pick latest and add _nightly
117117
if [ "$REV" == "" ]; then export REV=`git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags origin 'v*.*.*' | tail -1 | cut -f3 -d/ | cut -f2 -dv`_nightly; fi
118118
echo Cross-compiling for MinGW Windows on $RUNNER_OS with version set to $REV

0 commit comments

Comments
 (0)