diff --git a/.github/workflows/azure.aad.fs.yml b/.github/workflows/azure.aad.fs.yml new file mode 100644 index 0000000..4e6537c --- /dev/null +++ b/.github/workflows/azure.aad.fs.yml @@ -0,0 +1,31 @@ +name: public/Azure.AAD.fs +on: + push: + branches: + - master + - "refs/tags/*" + pull_request: + branches: + - master +env: + BUILD_NUMBER: "${{ github.run_number }}" +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-dotnet@v4.0.0 + with: + dotnet-version: 8.0.100 + - name: Restore tools + run: dotnet tool restore + - name: Build + run: dotnet fsi build.fsx -t ci + if: ${{ !startsWith(github.ref, 'refs/tags') }} + - name: Build and publish + env: + NUGET_REPO_KEY: "${{ secrets.NUGET_REPO_KEY }}" + NUGET_REPO_URL: "${{ vars.NUGET_REPO_URL }}" + run: dotnet fsi build.fsx -t release + if: ${{ startsWith(github.ref, 'refs/tags') }} diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index c331d4a..c87cba9 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 6.2.0 +* Resetting the build/revision counter + ### 6.1.0 * Reintroduce net6.0 target while keeping net8.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index eb4c8c3..0000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,40 +0,0 @@ -pool: - vmImage: 'ubuntu-latest' -variables: - BUILD_NUMBER: $[counter('buildCounter',1)] - NUGET_REPO_URL: https://api.nuget.org/v3/index.json - -trigger: - branches: - include: - - master - - refs/tags/* -pr: - branches: - include: - - master - -steps: - - task: UseDotNet@2 - inputs: - version: '8.0.100' - - - task: DotNetCoreCLI@2 - displayName: "Restore tools" - inputs: - command: custom - custom: tool - arguments: restore - - - task: DotNetCoreCLI@2 - displayName: "Build and publish" - env: - NUGET_REPO_KEY: $(NUGET_REPO_KEY) - inputs: - command: custom - custom: fsi - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags') }}: - arguments: 'build.fsx -t release' - ${{ if not(startsWith(variables['Build.SourceBranch'], 'refs/tags')) }}: - arguments: build.fsx -t ci - \ No newline at end of file diff --git a/build.fsx b/build.fsx index c474eda..ce0f394 100755 --- a/build.fsx +++ b/build.fsx @@ -5,7 +5,7 @@ #r "nuget: Fake.Core.ReleaseNotes" #r "nuget: Fake.Core.Target" #r "nuget: Fake.Tools.Git" -#r "nuget: MSBuild.StructuredLogger, 2.1.820" +#r "nuget: MSBuild.StructuredLogger, 2.2.243" open Fake.Core open Fake.Core.TargetOperators @@ -238,7 +238,7 @@ Target.create "releaseDocs" (fun _ -> let tempDocsDir = "tmp/gh-pages" Shell.cleanDir tempDocsDir Git.Repository.cloneSingleBranch "" gitRepo "gh-pages" tempDocsDir - Git.Repository.fullclean tempDocsDir + Git.Repository.fullClean tempDocsDir Shell.copyRecursive "output" tempDocsDir true |> Trace.tracefn "%A" Git.Staging.stageAll tempDocsDir Git.Commit.exec tempDocsDir (sprintf "Update generated documentation for version %s" release.NugetVersion)