Merge pull request #39 from wintoncode/fix-version-and-push

Fixed versioning and NuGet push

Author: mparry

.github/workflows/dotnet.yml

@@ -23,28 +23,29 @@ jobs:
         dotnet-version: 5.x
     - name: Version
       if: ${{ github.event_name != 'pull_request' }} 
-      run: ./etc/scripts/write_version_targets.sh
+      run: etc/scripts/write_version_targets.sh
+      shell: bash
     - name: Restore dependencies
       run: >
         dotnet restore
     - name: Build
       run: >
         dotnet build
         --no-restore --configuration Release --framework netstandard2.0
-        ./Winton.Extensions.Threading.Actor/Winton.Extensions.Threading.Actor.csproj
+        Winton.Extensions.Threading.Actor/Winton.Extensions.Threading.Actor.csproj
     - name: Test
       run: >
         dotnet test
         --no-restore --verbosity normal --configuration Release --framework net5.0
-        ./Winton.Extensions.Threading.Actor.Tests.Unit/Winton.Extensions.Threading.Actor.Tests.Unit.csproj
+        Winton.Extensions.Threading.Actor.Tests.Unit/Winton.Extensions.Threading.Actor.Tests.Unit.csproj
     - name: Pack
-      if: ${{ matrix.os == 'windows-latest' }} 
+      if: ${{ startsWith(matrix.os, 'windows-') }} 
       run: >
         dotnet pack
-        --no-build --no-restore --configuration Release --output ..
-        ./Winton.Extensions.Threading.Actor/Winton.Extensions.Threading.Actor.csproj
+        --no-build --no-restore --configuration Release --output .
+        Winton.Extensions.Threading.Actor/Winton.Extensions.Threading.Actor.csproj
     - name: Push
-      if: ${{ matrix.os == 'windows-latest' && github.event_name == 'release' }} 
+      if: ${{ startsWith(matrix.os, 'windows-') && github.event_name == 'release' }} 
       run: >
         dotnet nuget push
-        ./*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}}
+        *.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}}

etc/scripts/calculate_file_version.sh

@@ -26,28 +26,27 @@ esac;
 #    will set branch to the version number. This will mean that below the branch is
 #    treated as a release no matter what the true name of the branch is.
 # 2. Failing that, try to get the branch name using symbolic-ref
-# 3. ... but that won't work for detached heads so first try TRAVIS_BRANCH in case we're on Travis
-# 4. ... and if this isn't Travis try Appveyor
-# 4. ... and if this isn't Appveyor try to use git describe to get something even if it's just a sha
-# 5. ... but sometimes despite the --always, even that  will fail so just output the commitish.
-branch="$($GIT describe --tags --exact-match --match='[0-9]*.[0-9]*.[0-9]*' $commitish 2>/dev/null || $GIT symbolic-ref -q --short HEAD || echo ${TRAVIS_BRANCH:-})";
-
-if [[ -z $branch ]]; then
-    branch="${APPVEYOR_REPO_BRANCH}"
-fi;
-
+# 3. ... but that won't work for detached heads so first try GITHUB_REF
+# 4. ... else try to use git describe to get something even if it's just a sha
+# 5. ... but sometimes despite the --always, even that will fail so just output the commitish
+branch="$($GIT describe --tags --exact-match --match='[0-9]*.[0-9]*.[0-9]*' $commitish 2>/dev/null || $GIT symbolic-ref -q --short HEAD || echo ${GITHUB_REF:-})"
 if [[ -z $branch ]]; then
     branch="$($GIT describe --all --exact-match --always $commitish 2>/dev/null || echo $commitish)";
-fi;
+fi
 
 desc="$($GIT describe --tags --long --match='[0-9]*.[0-9]*.[0-9]*' $commitish 2>/dev/null || echo '0.0.0-0')";
-current_version="${desc%%-*}";
-branch_type="${branch%/*}";
-branch_short_name="${branch#*/}";
-
-if [ "$branch_type" = "$current_version" ]; then
-    branch_type="release";
-fi;
+current_version="${desc%%-*}"
+github_pr_regex="^refs/pull/([0-9]+)/merge"
+if [[ $branch =~ $github_pr_regex ]]; then
+    branch_type="feature"
+    branch_short_name="pr${BASH_REMATCH[1]}"
+else
+    branch_type="${branch%/*}"
+    branch_short_name="${branch#*/}"
+    if [ "$branch_type" = "$current_version" ]; then
+        branch_type="release"
+    fi
+fi
 
 major="${current_version%%.*}";
 minor="${current_version%.*}";