diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dc48650..9e815c3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -69,7 +69,7 @@ jobs: rm -rf conventions/.git/ - name: Validate current commit (last commit) with commitlint if: github.event_name == 'push' - run: ./conventions/commitlint.sh --from HEAD~1 --to HEAD --verbose + run: ./conventions/commitlint.sh --last --verbose - name: Validate PR commits with commitlint if: github.event_name == 'pull_request' run: ./conventions/commitlint.sh --from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} --to ${{ github.event.pull_request.head.sha }} --verbose diff --git a/scripts/publish.fsx b/scripts/publish.fsx index 8646ad2..b6e6def 100644 --- a/scripts/publish.fsx +++ b/scripts/publish.fsx @@ -72,28 +72,9 @@ let fullVersion = baseVersion | _ -> () - let nugetPush = - Path.Combine(rootDir.FullName, "Tools", "nugetPush.fsx") - |> FileInfo - - // to disable welcome msg, see https://stackoverflow.com/a/70493818/544947 - Environment.SetEnvironmentVariable("DOTNET_NOLOGO", "true") - let fullVersion = - Process - .Execute( - { - Command = "dotnet" - Arguments = - sprintf - "fsi %s --output-version %s" - nugetPush.FullName - baseVersion - }, - Echo.Off - ) - .UnwrapDefault() - .Trim() + Fsdk.Network.GetNugetPrereleaseVersionFromBaseVersion + baseVersion fullVersion diff --git a/version.config b/version.config index 9aa266b..699e7e4 100644 --- a/version.config +++ b/version.config @@ -1 +1 @@ -BaseVersion=0.6.1 +BaseVersion=0.7.99