From 6b1696edf4c6377061696b3bc72ac4f6cd4a3547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Echag=C3=BCe?= Date: Thu, 4 Aug 2022 21:13:39 -0300 Subject: [PATCH 1/3] Fix COMMIT_NUMBER environment variable definition (cherry picked from commit a582425d39c346eb088b2503f07e9408440ee5e1) --- .github/workflows/Build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 5f79352cb..83fa1f4df 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -77,6 +77,9 @@ jobs: } } + $COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease] + echo "COMMIT_NUMBER=$COMMIT_NUMBER" >> $env:COMMIT_NUMBER + $GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage "$GetFileVersionOutput" -match "(?<=FileVersion:)(.*)" > $null $GetFileVersionOutput = $Matches[0] @@ -91,7 +94,6 @@ jobs: Write-Output "Packge version to be used: $NUGET_PACKAGE_VERSION" - $COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease] $COMMIT_MESSAGE = $(git log -1 --pretty=%B) $LAST_COMMITTER = $(git log -1 --pretty=format:%an) From cdeeec40d2399911697cd6d4237e5a6909bf54ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Echag=C3=BCe?= Date: Thu, 4 Aug 2022 21:29:38 -0300 Subject: [PATCH 2/3] Fix typo in environment var declaration (cherry picked from commit fbff7727afc3721390d2d311703783cdfba34fd1) --- .github/workflows/Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 83fa1f4df..a72d317fc 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -78,7 +78,7 @@ jobs: } $COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease] - echo "COMMIT_NUMBER=$COMMIT_NUMBER" >> $env:COMMIT_NUMBER + echo "COMMIT_NUMBER=$COMMIT_NUMBER" >> $env:GITHUB_ENV $GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage "$GetFileVersionOutput" -match "(?<=FileVersion:)(.*)" > $null From 8cc709a12790d38075d460fd7fda238ae3a86278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Echag=C3=BCe?= Date: Thu, 4 Aug 2022 22:57:51 -0300 Subject: [PATCH 3/3] Fix COMMIT_NUMBER environment variable definition (cherry picked from commit ed26b298e606c781997ef4b1513bdfb0413d34a4) --- .github/workflows/Build.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index a72d317fc..fbdf96489 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -78,9 +78,10 @@ jobs: } $COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease] - echo "COMMIT_NUMBER=$COMMIT_NUMBER" >> $env:GITHUB_ENV + $COMMIT_MESSAGE = $(git log -1 --pretty=%B) + $LAST_COMMITTER = $(git log -1 --pretty=format:%an) - $GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage + $GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage /p:COMMIT_NUMBER=$COMMIT_NUMBER "$GetFileVersionOutput" -match "(?<=FileVersion:)(.*)" > $null $GetFileVersionOutput = $Matches[0] @@ -94,9 +95,6 @@ jobs: Write-Output "Packge version to be used: $NUGET_PACKAGE_VERSION" - $COMMIT_MESSAGE = $(git log -1 --pretty=%B) - $LAST_COMMITTER = $(git log -1 --pretty=format:%an) - echo "NUGET_PACKAGE_VERSION=$NUGET_PACKAGE_VERSION" >> $env:GITHUB_ENV echo "IsPrerelease=$IsPrerelease" >> $env:GITHUB_ENV