Skip to content

Commit 5dfc803

Browse files
author
Matthew John Cheetham
authored
Merge fc4b4fc into a21a996
2 parents a21a996 + fc4b4fc commit 5dfc803

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/build-installers.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ jobs:
2525
- name: Compute Scalar Version
2626
run: |
2727
BRANCH=$(git branch --show-current)
28-
if [ "${BRANCH:0:9" = "releases/" ]; then
29-
VERSION="${BRANCH:9}".0
28+
if [ "${BRANCH:0:9}" = "releases/" ]; then
29+
SCALARVERSION="${BRANCH:9}".0
3030
else
31-
VERSION=0.3.132.0
31+
SCALARVERSION=0.3.132.0
3232
fi
33-
export VERSION
33+
export SCALARVERSION
3434
3535
- name: Build Linux packages
36-
run: dotnet publish -c Release -p:ScalarVersion=$VERSION 'Scalar.Packaging.Linux/Scalar.Packaging.Linux.csproj'
36+
run: dotnet publish -c Release -p:ScalarVersion=$SCALARVERSION 'Scalar.Packaging.Linux/Scalar.Packaging.Linux.csproj'
3737

3838
# Because the actions/upload-artifact action does not allow you to specify
3939
# relative file paths we must first use a shell script to copy the

Scalar.Packaging.Linux/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ dotnet publish "$SCALAR_SRC" \
8282
--framework="$FRAMEWORK" \
8383
--runtime="$RUNTIME" \
8484
--self-contained=true \
85-
"/p:PublishSingleFile=True" \
85+
-p:ScalarVersion=$VERSION \
86+
-p:PublishSingleFile=True \
8687
--output="$(make_absolute "$PAYLOAD")" || exit 1
8788

8889
# Collect symbols

0 commit comments

Comments
 (0)