Skip to content

Commit

Permalink
More updates
Browse files Browse the repository at this point in the history
  • Loading branch information
1eyewonder committed Aug 24, 2024
1 parent fdd7035 commit a075b07
Show file tree
Hide file tree
Showing 8 changed files with 223 additions and 326 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@1eyewonder
12 changes: 7 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v2
- name: Use .NET 6 SDK
uses: actions/setup-dotnet@v1
- uses: actions/checkout@v4
- name: Use .NET 8 SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: '8.x'

# Not specifying a version will attempt to install via global.json
- name: Use .NET Core global.json
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4

- name: Build
if: runner.os != 'Windows'
Expand All @@ -26,6 +27,7 @@ jobs:
./build.sh
env:
CI: true

- name: Build
if: runner.os == 'Windows'
run: ./build.cmd
Expand Down
4 changes: 2 additions & 2 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.1.0] - 2017-03-17
First release
## [0.1.0] - 2024-08-23
Inital release

### Added
- This release already has lots of features
Expand Down
32 changes: 14 additions & 18 deletions build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ let coverageThresholdPercent = 80
let coverageReportDir = __SOURCE_DIRECTORY__ </> ".." </> "docs" </> "coverage"

let docsDir = __SOURCE_DIRECTORY__ </> ".." </> "docs"
let docsSrcDir = __SOURCE_DIRECTORY__ </> ".." </> "docsSrc"
let docsToolDir = __SOURCE_DIRECTORY__ </> ".." </> "docsTool"

let gitOwner = "1eyewonder"
let gitRepoName = "Fs.TestContainers"
Expand Down Expand Up @@ -78,9 +76,9 @@ let docsSiteBaseUrl = sprintf "https://%s.github.io/%s" gitOwner gitRepoName

let disableCodeCoverage = environVarAsBoolOrDefault "DISABLE_COVERAGE" false

let githubToken = Environment.environVarOrNone "GITHUB_TOKEN"
let githubToken = Environment.environVarOrNone "MY_GITHUB_TOKEN"

let nugetToken = Environment.environVarOrNone "NUGET_TOKEN"
let nugetToken = Environment.environVarOrNone "MY_;NUGET_TOKEN"

//-----------------------------------------------------------------------------
// Helpers
Expand Down Expand Up @@ -289,10 +287,9 @@ let updateChangelog ctx =
"Version %s already exists in %s, released on %s"
verStr
changelogFilename
(if entry.Date.IsSome then
entry.Date.Value.ToString("yyyy-MM-dd")
else
"(no date specified)")
(match entry.Date with
| Some d -> d.ToString("yyyy-MM-dd")
| None -> "(no date specified)")

failwith "Can't release with a duplicate version number")

Expand All @@ -303,10 +300,9 @@ let updateChangelog ctx =
"You're trying to release version %s, but a later version %s already exists, released on %s"
verStr
entry.SemVer.AsString
(if entry.Date.IsSome then
entry.Date.Value.ToString("yyyy-MM-dd")
else
"(no date specified)")
(match entry.Date with
| Some d -> d.ToString("yyyy-MM-dd")
| None -> "(no date specified)")

failwith "Can't release with a version number older than an existing release")

Expand Down Expand Up @@ -356,7 +352,7 @@ let updateChangelog ctx =

let tailLines = File.read changelogFilename |> List.ofSeq |> List.rev

let isRef line =
let isRef (line: string) =
System.Text.RegularExpressions.Regex.IsMatch(line, @"^\[.+?\]:\s?[a-z]+://.*$")

let linkReferenceTargets =
Expand Down Expand Up @@ -703,11 +699,11 @@ let initTargets () =
// "DotnetPack" ?=>! "BuildDocs"
"GenerateCoverageReport" ?=>! "ReleaseDocs"

"DotnetRestore"
==> "CheckFormatCode"
==> "DotnetBuild"
==> "FSharpAnalyzers"
==> "DotnetTest"
"DotnetRestore" ==>! "CheckFormatCode"
"CheckFormatCode" ==>! "DotnetBuild"
"DotnetBuild" ==>! "FSharpAnalyzers"

"DotnetBuild" ==> "DotnetTest"
=?> ("GenerateCoverageReport", not disableCodeCoverage)
==> "DotnetPack"
// ==> "SourceLinkTest"
Expand Down
2 changes: 1 addition & 1 deletion build/build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<WarnOn>3390;$(WarnOn)</WarnOn>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.3",
"version": "8.0.4",
"rollForward": "latestMinor"
}
}
3 changes: 3 additions & 0 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
source https://api.nuget.org/v3/index.json
storage: none
framework: auto-detect
nuget FSharp.Core
nuget Microsoft.SourceLink.GitHub copy_local: true
nuget Expecto
Expand All @@ -10,6 +11,7 @@ nuget TestContainers

group Build
storage: none
framework: auto-detect
source https://api.nuget.org/v3/index.json
nuget Fake.IO.FileSystem
nuget Fake.Core.Target
Expand All @@ -28,6 +30,7 @@ group Build
group Analyzers
source https://api.nuget.org/v3/index.json
storage: analyzers
framework: auto-detect

nuget FSharp.Analyzers.Build
nuget G-Research.FSharp.Analyzers
Expand Down
Loading

0 comments on commit a075b07

Please sign in to comment.