Skip to content

Commit 5a94596

Browse files
authored
Merge pull request #1 from TheAngryByrd/ci-support
CI and README
2 parents fca7c43 + 0e39ab9 commit 5a94596

File tree

8 files changed

+53
-29
lines changed

8 files changed

+53
-29
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Describe the big picture of your changes here to communicate to the maintainers
44

55
## Types of changes
66

7-
What types of changes does your code introduce to Redis.Streams?
7+
What types of changes does your code introduce to FSharp.Control.Redis.Streams?
88
_Put an `x` in the boxes that apply_
99

1010
- [ ] Bugfix (non-breaking change which fixes an issue)

.paket/Paket.Restore.targets

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,10 @@
252252
</PropertyGroup>
253253

254254
<ItemGroup>
255-
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion.Split(`+`)[0]).nuspec"/>
255+
<_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion).nuspec"/>
256256
</ItemGroup>
257257

258-
<Exec Condition="@(_NuspecFiles) != ''" Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' />
259-
<Error Condition="@(_NuspecFiles) == ''" Text='Could not find nuspec files in "$(AdjustedNuspecOutputPath)" (Version: "$(PackageVersion)"), therefore we cannot call "paket fix-nuspecs" and have to error out!' />
258+
<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />
260259

261260
<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
262261
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ mono:
1010
- weekly # => "latest commits"
1111
os:
1212
- linux
13+
services:
14+
- redis-server
1315

1416
script:
1517
- ./build.sh

Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<PropertyGroup>
33
<!-- summary is not migrated from project.json, but you can use the <Description> property for that if needed. -->
44
<PackageTags>f#, fsharp</PackageTags>
5-
<PackageProjectUrl>https://github.com/MyGithubUsername/Redis.Streams</PackageProjectUrl>
6-
<PackageLicenseUrl>https://github.com/MyGithubUsername/Redis.Streams/blob/master/LICENSE.md</PackageLicenseUrl>
5+
<PackageProjectUrl>https://github.com/TheAngryByrd/FSharp.Control.Redis.Streams</PackageProjectUrl>
6+
<PackageLicenseUrl>https://github.com/TheAngryByrd/FSharp.Control.Redis.Streams/blob/master/LICENSE.md</PackageLicenseUrl>
77
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
88
<RepositoryType>git</RepositoryType>
9-
<Authors>MyGithubUsername</Authors>
10-
<RepositoryUrl>https://github.com/MyGithubUsername/Redis.Streams</RepositoryUrl>
9+
<Authors>TheAngryByrd</Authors>
10+
<RepositoryUrl>https://github.com/TheAngryByrd/FSharp.Control.Redis.Streams</RepositoryUrl>
1111
<!-- owners is not supported in MSBuild -->
1212
</PropertyGroup>
1313
</Project>

README.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
# Redis.Streams
1+
# FSharp.Control.Redis.Streams
22

3-
[Enter useful description for Redis.Streams]
3+
FSharp.Control.Redis.Streams is a library dedicated to bridging [Redis Streams](https://redis.io/topics/streams-intro) with .NET Streaming technologies.
4+
5+
Currently Supported:
6+
7+
- [Hopac Streams](https://hopac.github.io/Hopac/Hopac.html#def:module%20Hopac.Stream)
8+
- [Akka.net Streams](https://getakka.net/articles/streams/introduction.html)
9+
- [Reactive Extensions](http://reactivex.io/)
410

511
---
612

713
## Builds
814

915
MacOS/Linux | Windows
1016
--- | ---
11-
[![Travis Badge](https://travis-ci.org/MyGithubUsername/Redis.Streams.svg?branch=master)](https://travis-ci.org/MyGithubUsername/Redis.Streams) | [![Build status](https://ci.appveyor.com/api/projects/status/github/MyGithubUsername/Redis.Streams?svg=true)](https://ci.appveyor.com/project/MyGithubUsername/Redis.Streams)
12-
[![Build History](https://buildstats.info/travisci/chart/MyGithubUsername/Redis.Streams)](https://travis-ci.org/MyGithubUsername/Redis.Streams/builds) | [![Build History](https://buildstats.info/appveyor/chart/MyGithubUsername/Redis.Streams)](https://ci.appveyor.com/project/MyGithubUsername/Redis.Streams)
17+
[![Travis Badge](https://travis-ci.org/TheAngryByrd/FSharp.Control.Redis.Streams.svg?branch=master)](https://travis-ci.org/TheAngryByrd/FSharp.Control.Redis.Streams) | No Redis 5.0 Support On Windows
18+
[![Build History](https://buildstats.info/travisci/chart/TheAngryByrd/FSharp.Control.Redis.Streams)](https://travis-ci.org/TheAngryByrd/FSharp.Control.Redis.Streams/builds) |
1319

1420

1521
## Nuget
1622

1723
Stable | Prerelease
1824
--- | ---
19-
[![NuGet Badge](https://buildstats.info/nuget/Redis.Streams)](https://www.nuget.org/packages/Redis.Streams/) | [![NuGet Badge](https://buildstats.info/nuget/Redis.Streams?includePreReleases=true)](https://www.nuget.org/packages/Redis.Streams/)
25+
[![NuGet Badge](https://buildstats.info/nuget/FSharp.Control.Redis.Streams)](https://www.nuget.org/packages/FSharp.Control.Redis.Streams/) | [![NuGet Badge](https://buildstats.info/nuget/FSharp.Control.Redis.Streams?includePreReleases=true)](https://www.nuget.org/packages/FSharp.Control.Redis.Streams/)
2026

2127
### Developing
2228

@@ -31,6 +37,16 @@ Make sure the following **requirements** are installed in your system:
3137

3238
* [dotnet SDK](https://www.microsoft.com/net/download/core) 2.0 or higher
3339
* [Mono](http://www.mono-project.com/) if you're on Linux or macOS.
40+
* [docker-compose](https://docs.docker.com/compose/)
41+
42+
43+
Stand up redis via docker:
44+
45+
```sh
46+
docker-compose up
47+
```
48+
49+
Build:
3450

3551
```
3652
> build.cmd // on windows
@@ -43,6 +59,8 @@ $ ./build.sh // on unix
4359
* `CONFIGURATION=Debug ./build.sh` will result in things like `dotnet build -c Debug`
4460
* `GITHUB_TOKEN` will be used to upload release notes and nuget packages to github.
4561
* Be sure to set this before releasing
62+
- `DISABLE_COVERAGE` Will disable running code coverage metrics. AltCover can have [severe performance degradation](https://github.com/SteveGilham/altcover/issues/57) so it worth disabling when looking to do a quicker feedback loop.
63+
- `DISABLE_COVERAGE=1 ./build.sh`
4664

4765
### Watch Tests
4866

appveyor.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

build.fsx

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ BuildServer.install [
2020
Travis.Installer
2121
]
2222

23+
let environVarAsBoolOrDefault varName defaultValue =
24+
let truthyConsts = [
25+
"1"
26+
"Y"
27+
"YES"
28+
"T"
29+
"TRUE"
30+
]
31+
try
32+
let envvar = (Environment.environVar varName).ToUpper()
33+
truthyConsts |> List.exists((=)envvar)
34+
with
35+
| _ -> defaultValue
36+
2337
//-----------------------------------------------------------------------------
2438
// Metadata and Configuration
2539
//-----------------------------------------------------------------------------
@@ -42,7 +56,7 @@ let toolsDir = __SOURCE_DIRECTORY__ @@ "tools"
4256
let coverageThresholdPercent = 80
4357
let coverageReportDir = __SOURCE_DIRECTORY__ @@ "docs" @@ "coverage"
4458

45-
let gitOwner = "MyGithubUsername"
59+
let gitOwner = "TheAngryByrd"
4660
let gitRepoName = "FSharp.Control.Redis.Streams"
4761

4862
let releaseBranch = "master"
@@ -52,6 +66,9 @@ let publishUrl = "https://www.nuget.org"
5266

5367
let paketToolPath = __SOURCE_DIRECTORY__ </> ".paket" </> (if Environment.isWindows then "paket.exe" else "paket")
5468

69+
70+
let disableCodeCoverage = environVarAsBoolOrDefault "DISABLE_COVERAGE" false
71+
5572
//-----------------------------------------------------------------------------
5673
// Helpers
5774
//-----------------------------------------------------------------------------
@@ -172,7 +189,7 @@ let dotnetTest ctx =
172189
let args =
173190
[
174191
"--no-build"
175-
"/p:AltCover=false"
192+
sprintf "/p:AltCover=%b" (not disableCodeCoverage)
176193
sprintf "/p:AltCoverThreshold=%d" coverageThresholdPercent
177194
sprintf "/p:AltCoverAssemblyExcludeFilter=%s" excludeCoverage
178195
]
@@ -370,7 +387,7 @@ Target.create "Release" ignore
370387
"DotnetRestore"
371388
==> "DotnetBuild"
372389
==> "DotnetTest"
373-
==> "GenerateCoverageReport"
390+
=?> ("GenerateCoverageReport", not disableCodeCoverage)
374391
==> "DotnetPack"
375392
==> "SourcelinkTest"
376393
==> "PublishToNuget"

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ then
3535
dotnet tool install paket --tool-path "$PAKET_TOOL_PATH"
3636
fi
3737

38-
FAKE_DETAILED_ERRORS=true "$FAKE" build -t "$@"
38+
DISABLE_COVERAGE=1 FAKE_DETAILED_ERRORS=true "$FAKE" build -t "$@"

0 commit comments

Comments
 (0)