diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index d7d7ab6..0000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: Release docs - -on: - push: - tags: - - '*' - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.201 - - name: Restore tools - run: dotnet tool restore - - name: Restore dependencies - run: dotnet restore - - name: Generate docs - run: dotnet fake build -t Docs - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - personal_token: ${{ secrets.PERSONAL_TOKEN }} - publish_dir: ./docs/_public - publish_branch: gh-pages - force_orphan: true \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 663b7a8..cb46a6a 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +### 0.8.1-beta +* Replace deprecated AWS ProfileManager usage +* Bumped test project netcoreapp version to 3.1 +* Fixed 'Invalid UpdateExpression' exception for precomputed Map.remove operations (#20) + ### 0.8.0-beta * Move to netstandard2.0. diff --git a/build.fsx b/build.fsx index 34db86f..59c80e8 100644 --- a/build.fsx +++ b/build.fsx @@ -31,7 +31,7 @@ let gitHome = "https://github.com/" + gitOwner let buildDir = "./build/" let nugetDir = "./out/" - + System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__ let release = ReleaseNotes.parse (System.IO.File.ReadAllLines "RELEASE_NOTES.md") @@ -70,7 +70,7 @@ Target.create "AssemblyInfo" (fun _ -> AssemblyInfo.InternalsVisibleTo (projectName + ".Tests") ] - let getProjectDetails projectPath = + let getProjectDetails (projectPath : string) = let projectName = System.IO.Path.GetFileNameWithoutExtension(projectPath) ( projectPath, projectName, @@ -124,7 +124,15 @@ Target.create "Pack" (fun _ -> { p with Configuration = DotNet.BuildConfiguration.Release OutputPath = Some nugetDir - MSBuildParams = { p.MSBuildParams with Properties = [("Version", release.NugetVersion); ("PackageReleaseNotes", String.concat "\n" release.Notes)]} + MSBuildParams = { p.MSBuildParams with + Properties = + [ + ("Version", release.NugetVersion) + ("PackageReleaseNotes", String.concat "\n" release.Notes) + // ("IncludeSymbols", "true") + // ("SymbolPackageFormat", "snupkg") // https://github.com/fsprojects/Paket/issues/3685 + ] + } } ) "FSharp.AWS.DynamoDB.sln" ) @@ -145,17 +153,12 @@ Target.create "ReleaseGitHub" (fun _ -> Git.Branches.pushTag "" remote release.NugetVersion let client = - let user = - match getBuildParam "github-user" with - | s when not (isNullOrWhiteSpace s) -> s - | _ -> UserInput.getUserInput "Username: " - let pw = - match getBuildParam "github-pw" with - | s when not (isNullOrWhiteSpace s) -> s - | _ -> UserInput.getUserPassword "Password: " - - // Git.createClient user pw - GitHub.createClient user pw + let token = + match getBuildParam "GITHUB_TOKEN" with + | s when not (isNullOrWhiteSpace s) -> s + | _ -> failwith "please set the GITHUB_TOKEN environment variable to a github personal access token with repo access." + + GitHub.createClientWithToken token let files = !! (nugetDir "*.nupkg") // release on github @@ -164,13 +167,13 @@ Target.create "ReleaseGitHub" (fun _ -> |> GitHub.draftNewRelease gitOwner gitName release.NugetVersion (release.SemVer.PreRelease <> None) release.Notes (cl,files) ||> Seq.fold (fun acc e -> acc |> GitHub.uploadFile e) - |> GitHub.publishDraft//releaseDraft + |> GitHub.publishDraft |> Async.RunSynchronously ) Target.create "Push" (fun _ -> let key = - match getBuildParam "nuget-key" with + match getBuildParam "NUGET_KEY" with | s when not (isNullOrWhiteSpace s) -> s | _ -> UserInput.getUserPassword "NuGet Key: " Paket.push (fun p -> { p with WorkingDir = nugetDir; ApiKey = key })) diff --git a/src/FSharp.AWS.DynamoDB/AssemblyInfo.fs b/src/FSharp.AWS.DynamoDB/AssemblyInfo.fs index 5baf786..61c5b8e 100644 --- a/src/FSharp.AWS.DynamoDB/AssemblyInfo.fs +++ b/src/FSharp.AWS.DynamoDB/AssemblyInfo.fs @@ -6,8 +6,8 @@ open System.Runtime.CompilerServices [] [] [] -[] -[] +[] +[] [] do () @@ -15,6 +15,6 @@ module internal AssemblyVersionInformation = let [] AssemblyTitle = "FSharp.AWS.DynamoDB" let [] AssemblyProduct = "FSharp.AWS.DynamoDB" let [] AssemblyDescription = "An F# wrapper over the standard Amazon.DynamoDB library" - let [] AssemblyVersion = "0.8.0" - let [] AssemblyFileVersion = "0.8.0" + let [] AssemblyVersion = "0.8.1" + let [] AssemblyFileVersion = "0.8.1" let [] InternalsVisibleTo = "FSharp.AWS.DynamoDB.Tests" diff --git a/src/FSharp.AWS.DynamoDB/FSharp.AWS.DynamoDB.fsproj b/src/FSharp.AWS.DynamoDB/FSharp.AWS.DynamoDB.fsproj index 6bcc112..0aa6e6c 100644 --- a/src/FSharp.AWS.DynamoDB/FSharp.AWS.DynamoDB.fsproj +++ b/src/FSharp.AWS.DynamoDB/FSharp.AWS.DynamoDB.fsproj @@ -9,8 +9,8 @@ Copyright 2016 - https://github.com/eiriktsarpalis/FSharp.AWS.DynamoDB/blob/master/License.md - https://github.com/eiriktsarpalis/FSharp.AWS.DynamoDB + https://github.com/fsprojects/FSharp.AWS.DynamoDB/blob/master/License.md + https://github.com/fsprojects/FSharp.AWS.DynamoDB https://avatars0.githubusercontent.com/u/6001315 fsharp, f#, aws, amazon, dynamodb