Skip to content

Commit 561a3b5

Browse files
committed
Enable "build on tag" also in McXtrace
1 parent e65cdb2 commit 561a3b5

1 file changed

Lines changed: 15 additions & 3 deletions

File tree

.github/workflows/mcxtrace-autobuild.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ jobs:
8080
set -u
8181
set -x
8282
cd McCode
83-
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`
83+
# Check if this is a clear-cut release-tag build:
84+
export REV=`git tag --points-at HEAD`
85+
# Otherwise, pick latest and add _nightly
86+
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
87+
echo Building on $RUNNER_OS with version set to $REV
8488
if [ "$RUNNER_OS" == "macOS" ]; then ./buildscripts/build_macos_mcxtrace ${REV} && tar cfz mcxtrace-macOS-conda.tgz mcxtrace-macOS-arm64/ mcxtrace-macOS-x86_64/; fi;
8589
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcxtrace ${REV} meta && mv dist mcxtrace-debian-x86_64 && tar cfz mcxtrace-debian-x86_64.tgz mcxtrace-debian-x86_64/; fi
8690
@@ -92,7 +96,11 @@ jobs:
9296
set -u
9397
set -x
9498
cd McCode
95-
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`
99+
# Check if this is a clear-cut release-tag build:
100+
export REV=`git tag --points-at HEAD`
101+
# Otherwise, pick latest and add _nightly
102+
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
103+
echo Building on $RUNNER_OS with version set to $REV
96104
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_debs_mcxtrace_arm64 ${REV} meta && mv dist mcxtrace-debian-arm64 && tar cfz mcxtrace-debian-arm64.tgz mcxtrace-debian-arm64/; fi
97105
98106
- name: Cross-Build McXtrace for windows
@@ -103,7 +111,11 @@ jobs:
103111
set -u
104112
set -x
105113
cd McCode
106-
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`
114+
# Check if this is a clear-cut release-tag build:
115+
export REV=`git tag --points-at HEAD`
116+
# Otherwise, pick latest and add _nightly
117+
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
118+
echo Cross-compiling for MinGW Windows on $RUNNER_OS with version set to $REV
107119
if [ "$RUNNER_OS" == "Linux" ]; then rm -rf dist; fi
108120
if [ "$RUNNER_OS" == "Linux" ]; then ./buildscripts/build_windows_mcxtrace ${REV} meta && mv dist mcxtrace-mingw64-Windows-x86_64; fi
109121
if [ "$RUNNER_OS" == "Linux" ]; then tar cfz mcxtrace-Windows-x86_64.tgz mcxtrace-mingw64-Windows-x86_64/; fi

0 commit comments

Comments
 (0)