Merge pull request #167 from nickgra/gitprbuild

Fix parsing of GVFS-aware Git version numbers that contain - (for PR validation builds) Correct regex used to match GVFS-aware Git package to actually match the NuGet spec for what defines a package. See https://docs.microsoft.com/en-us/nuget/reference/package-versioning
microsoft · Aug 16, 2018 · ecab6ac · ecab6ac
2 parents c838635 + fff61e5
commit ecab6ac
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Scripts/Mac/BuildGVFSForMac.sh b/Scripts/Mac/BuildGVFSForMac.sh
@@ -33,8 +33,7 @@ if [ ! -d $BUILDDIR ]; then
 fi
 
 $SCRIPTDIR/DownloadGVFSGit.sh || exit 1
-GVFSPROPS=$SRCDIR/GVFS/GVFS.Build/GVFS.props
-GITVERSION="$(cat $GVFSPROPS | grep GitPackageVersion | grep -Eo '[0-9.]{1,}')"
+GITVERSION="$($SCRIPTDIR/GetGitVersionNumber.sh)"
 GITPATH="$(find $PACKAGES/gitformac.gvfs.installer/$GITVERSION -type f -name *.dmg)" || exit 1
 # Now that we have a path containing the version number, generate GVFSConstants.GitVersion.cs
 $SCRIPTDIR/GenerateGitVersionConstants.sh "$GITPATH" $BUILDDIR || exit 1

diff --git a/Scripts/Mac/DownloadGVFSGit.sh b/Scripts/Mac/DownloadGVFSGit.sh
@@ -2,8 +2,7 @@ SCRIPTDIR="$(dirname ${BASH_SOURCE[0]})"
 SRCDIR=$SCRIPTDIR/../..
 BUILDDIR=$SRCDIR/../BuildOutput/GVFS.Build
 PACKAGESDIR=$SRCDIR/../packages
-GVFSPROPS=$SRCDIR/GVFS/GVFS.Build/GVFS.props
-GITVERSION="$(cat $GVFSPROPS | grep GitPackageVersion | grep -Eo '[0-9.]{1,}')"
+GITVERSION="$($SCRIPTDIR/GetGitVersionNumber.sh)"
 cp $SRCDIR/nuget.config $BUILDDIR
 dotnet new classlib -n GVFS.Restore -o $BUILDDIR --force
 dotnet add $BUILDDIR/GVFS.Restore.csproj package --package-directory $PACKAGESDIR GitForMac.GVFS.Installer --version $GITVERSION
diff --git a/Scripts/Mac/GetGitVersionNumber.sh b/Scripts/Mac/GetGitVersionNumber.sh
@@ -0,0 +1,4 @@
+SCRIPTDIR="$(dirname ${BASH_SOURCE[0]})"
+GVFSPROPS=$SCRIPTDIR/../../GVFS/GVFS.Build/GVFS.props
+GITVERSION="$(cat $GVFSPROPS | grep GitPackageVersion | grep -Eo '[0-9.]+(-\w+)?')"
+echo $GITVERSION
diff --git a/Scripts/Mac/PrepFunctionalTests.sh b/Scripts/Mac/PrepFunctionalTests.sh
@@ -3,8 +3,7 @@
 SCRIPTDIR=$(dirname ${BASH_SOURCE[0]})
 
 # Install GVFS-aware Git (that was downloaded by the build script)
-GVFSPROPS=$SCRIPTDIR/../../GVFS/GVFS.Build/GVFS.props
-GITVERSION="$(cat $GVFSPROPS | grep GitPackageVersion | grep -Eo '[0-9.]{1,}')"
+GITVERSION="$($SCRIPTDIR/GetGitVersionNumber.sh)"
 ROOTDIR=$SCRIPTDIR/../../..
 GITDIR=$ROOTDIR/packages/gitformac.gvfs.installer/$GITVERSION/tools
 if [[ ! -d $GITDIR ]]; then