Skip to content

Commit

Permalink
linux-packaging: ensure correct version used on Linux
Browse files Browse the repository at this point in the history
Ensure the correct application version number is passed through to the
inner-publish step when building the Linux packages.
  • Loading branch information
mjcheetham committed Oct 21, 2020
1 parent a21a996 commit fc4b4fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
- name: Compute Scalar Version
run: |
BRANCH=$(git branch --show-current)
if [ "${BRANCH:0:9" = "releases/" ]; then
VERSION="${BRANCH:9}".0
if [ "${BRANCH:0:9}" = "releases/" ]; then
SCALARVERSION="${BRANCH:9}".0
else
VERSION=0.3.132.0
SCALARVERSION=0.3.132.0
fi
export VERSION
export SCALARVERSION
- name: Build Linux packages
run: dotnet publish -c Release -p:ScalarVersion=$VERSION 'Scalar.Packaging.Linux/Scalar.Packaging.Linux.csproj'
run: dotnet publish -c Release -p:ScalarVersion=$SCALARVERSION 'Scalar.Packaging.Linux/Scalar.Packaging.Linux.csproj'

# Because the actions/upload-artifact action does not allow you to specify
# relative file paths we must first use a shell script to copy the
Expand Down
3 changes: 2 additions & 1 deletion Scalar.Packaging.Linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ dotnet publish "$SCALAR_SRC" \
--framework="$FRAMEWORK" \
--runtime="$RUNTIME" \
--self-contained=true \
"/p:PublishSingleFile=True" \
-p:ScalarVersion=$VERSION \
-p:PublishSingleFile=True \
--output="$(make_absolute "$PAYLOAD")" || exit 1

# Collect symbols
Expand Down

0 comments on commit fc4b4fc

Please sign in to comment.