Skip to content

Commit 6d28d40

Browse files
committed
Merge branch 'main' of https://github.com/fsprojects/FSharp.Control.AsyncSeq into housekeeping/upgrade-net8
2 parents d6eae90 + 4210e65 commit 6d28d40

27 files changed

Lines changed: 16631 additions & 7519 deletions

.config/dotnet-tools.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fsharp.formatting.commandtool": {
6-
"version": "11.4.1",
6+
"version": "11.4.3",
77
"commands": [
88
"fsdocs"
99
],
@@ -22,6 +22,12 @@
2222
"fake"
2323
],
2424
"rollForward": false
25+
},
26+
"fable": {
27+
"version": "3.4.2",
28+
"commands": [
29+
"fable"
30+
]
2531
}
2632
}
2733
}

.github/workflows/publish.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build and Publish
22
on:
33
push:
4-
branches: [ master ]
4+
branches: [ main ]
55
jobs:
66
build:
77
runs-on: ubuntu-latest
@@ -13,20 +13,21 @@ jobs:
1313
dotnet-version: '8.0.19'
1414
- name: Install tools
1515
run: dotnet tool restore
16-
- name: Build and Test and Docs using FAKE
17-
run: dotnet fake build
16+
- name: Build and Test
17+
run: dotnet test -c Release
18+
- name: Pack
19+
run: dotnet pack -c Release
20+
- name: Build docs
21+
run: dotnet fsdocs build --properties Configuration=Release
1822
- name: Deploy
1923
uses: peaceiris/actions-gh-pages@v3
2024
with:
2125
personal_token: ${{ secrets.GITHUB_TOKEN }}
2226
publish_dir: ./output
2327
publish_branch: gh-pages
2428
force_orphan: true
25-
- name: Examine bin
26-
run: ls -r bin
2729
- name: Publish NuGets (if this version not published before)
28-
run: dotnet nuget push bin/FSharp.Control.AsyncSeq.*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN_2021 }} --skip-duplicate
30+
run: dotnet nuget push src/FSharp.Control.AsyncSeq/bin/Release/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_TOKEN_2021 }} --skip-duplicate
2931

3032
# NUGET_ORG_TOKEN_2021 is listed in "Repository secrets" in https://github.com/fsprojects/FSharp.Control.AsyncSeq/settings/secrets/actions
31-
# note, the nuget org token expires around 24 July 2022
32-
33+
# note, the nuget org token expires around 24 July 2022

.github/workflows/pull-request.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@ name: Build and Test Pull Request
22

33
on:
44
pull_request:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v2
12-
- name: Setup .NET
13-
uses: actions/[email protected]
14-
with:
15-
dotnet-version: '3.1.x'
1612
- name: Setup .NET
1713
uses: actions/[email protected]
1814
with:
1915
dotnet-version: '8.0.19'
16+
- name: Setup Node.js environment
17+
uses: actions/[email protected]
18+
with:
19+
node-version: 14.17.*
2020
- name: Install tools
2121
run: dotnet tool restore
22-
- name: Build Test and Docs using FAKE
23-
run: dotnet fake build
22+
- name: Build and Test
23+
run: dotnet test -c Release
24+
- name: Test Fable
25+
run: cd tests/fable && npm i && npm test && cd ../..

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,11 @@ xunit*.html
200200
artifacts/
201201
bin/
202202

203+
# fable
204+
*.fs.js
205+
fable_modules
206+
.fable
207+
203208
# jest/fable directories
204209
tests/fable/dist/
205210
tests/fable/node_modules/

.paket/Paket.Restore.targets

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

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[![Build status](https://ci.appveyor.com/api/projects/status/22wknie0x5c2jfuo/branch/master?svg=true)](https://ci.appveyor.com/project/SteffenForkmann/fsharp-control-asyncseq/branch/master)
2-
[![Build status](https://travis-ci.org/fsprojects/FSharp.Control.AsyncSeq.svg?branch=master)](https://travis-ci.org/fsprojects/FSharp.Control.AsyncSeq)
3-
41
# FSharp.Control.AsyncSeq [![NuGet Status](http://img.shields.io/nuget/v/FSharp.Control.AsyncSeq.svg?style=flat)](https://www.nuget.org/packages/FSharp.Control.AsyncSeq/)
52

63
**FSharp.Control.AsyncSeq** is a collection of asynchronous programming utilities for F#.

RELEASE_NOTES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 3.2.1
2+
* Release latest
3+
4+
### 3.2.0
5+
* [Update to Fable 3.0](https://github.com/fsprojects/FSharp.Control.AsyncSeq/pull/148)
16

27
### 3.1.0
38
* Sorting functions https://github.com/fsprojects/FSharp.Control.AsyncSeq/issues/126

build.cmd

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

build.fsx

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

build.sh

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

0 commit comments

Comments
 (0)