Skip to content

Commit 0d237b4

Browse files
authored
Merge branch 'main' into ce-cancellation-poc
2 parents d37ab57 + 0fccf7b commit 0d237b4

File tree

19 files changed

+2394
-98
lines changed

19 files changed

+2394
-98
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: checkout-code
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
with:
1414
fetch-depth: 0
1515

@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
# checkout the code
3030
- name: checkout-code
31-
uses: actions/checkout@v4
31+
uses: actions/checkout@v5
3232
with:
3333
fetch-depth: 0
3434

.github/workflows/main.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
# checkout the code
1414
- name: checkout-code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
1818
# setup dotnet based on global.json
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
# checkout the code
3333
- name: checkout-code
34-
uses: actions/checkout@v4
34+
uses: actions/checkout@v5
3535
with:
3636
fetch-depth: 0
3737
# setup dotnet based on global.json
@@ -44,7 +44,7 @@ jobs:
4444
shell: cmd
4545
run: ./build.cmd ci -release
4646
- name: Publish test results - release
47-
uses: dorny/test-reporter@v1
47+
uses: dorny/test-reporter@v2
4848
if: always()
4949
with:
5050
name: Report release tests

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
# checkout the code
1414
- name: checkout-code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616
with:
1717
fetch-depth: 0
1818
# setup dotnet based on global.json

.github/workflows/repo-assist.lock.yml

Lines changed: 1858 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/repo-assist.md

Lines changed: 366 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/test-report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
test-report-release:
1414
runs-on: windows-latest
1515
steps:
16-
- uses: dorny/test-reporter@v1
16+
- uses: dorny/test-reporter@v2
1717
with:
1818
artifact: test-results-release # artifact name
1919
name: Report release tests # Name of the check run which will be created
@@ -23,7 +23,7 @@ jobs:
2323
test-report-debug:
2424
runs-on: windows-latest
2525
steps:
26-
- uses: dorny/test-reporter@v1
26+
- uses: dorny/test-reporter@v2
2727
with:
2828
artifact: test-results-debug # artifact name
2929
name: Report debug tests # Name of the check run which will be created

.github/workflows/test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
# checkout the code
1111
- name: checkout-code
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
with:
1414
fetch-depth: 0
1515

@@ -25,7 +25,7 @@ jobs:
2525
run: ./build.cmd ci -release
2626

2727
# upload test results
28-
- uses: actions/upload-artifact@v3
28+
- uses: actions/upload-artifact@v4
2929
if: success() || failure()
3030
with:
3131
name: test-results-release
@@ -39,7 +39,7 @@ jobs:
3939
steps:
4040
# checkout the code
4141
- name: checkout-code
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v5
4343
with:
4444
fetch-depth: 0
4545

@@ -55,7 +55,7 @@ jobs:
5555
run: ./build.cmd ci -debug
5656

5757
# upload test results
58-
- uses: actions/upload-artifact@v3
58+
- uses: actions/upload-artifact@v4
5959
if: success() || failure()
6060
with:
6161
name: test-results-debug

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ The `TaskSeq` project already has a wide array of functions and functionalities,
228228
- [ ] Make the tasks cancellable with token (see [#133]). **PLANNED FOR 0.5-alpha**
229229
- [ ] Support `ConfiguredCancelableAsyncEnumerable` (see [#167]). **PLANNED FOR 0.5-alpha**
230230
- [ ] Interop with `cancellableTask` and `valueTask` from [`IcedTasks`][24]
231-
- [ ] Interop with `AsyncSeq`.
231+
- [x] Interop with `AsyncSeq` (implemented in `FSharp.Control.AsyncSeq` package).
232232
- [ ] (maybe) Support any awaitable type in the function lib (that is: where a `Task` is required, accept a `ValueTask` and `Async` as well)
233233
- [ ] Add `TaskEx` functionality (separate lib). **DISCUSSION**
234234
- [ ] Move documentation to <https://fsprojects.github.io>

backdate-tags.cmd

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
@echo off
2+
3+
REM Batch file to override the date and/or message of existing tag, or create a new
4+
REM tag that takes the same date/time of an existing commit.
5+
REM
6+
REM Usage:
7+
REM > backdate-tags.cmd v0.1.1 "New message"
8+
REM
9+
REM How it works:
10+
REM * checkout the commit at the moment of the tag
11+
REM * get the date/time of that commit and store in GIT_COMMITER_DATE env var
12+
REM * recreate the tag (it will now take the date of its commit)
13+
REM * push tags changes to remove (with --force)
14+
REM * return to HEAD
15+
REM
16+
REM PS:
17+
REM * these escape codes are for underlining the headers so they stand out between all GIT's output garbage
18+
REM * the back-dating trick is taken from here: https://stackoverflow.com/questions/21738647/change-date-of-git-tag-or-github-release-based-on-it
19+
20+
ECHO.
21+
ECHO List existing tags:
22+
git tag -n
23+
24+
ECHO.
25+
ECHO Checkout to tag:
26+
git checkout tags/%1
27+
28+
REM Output the first string, containing the date of commit, and put it in a file
29+
REM then set the contents of that file to env var GIT_COMMITTER_DATE (which in turn is needed to enable back-dating)
30+
REM then delete the temp file
31+
ECHO.
32+
ECHO Retrieve original commit date
33+
34+
git show --format=%%aD | findstr "^[MTWFS][a-z][a-z],.*" > _date.tmp
35+
< _date.tmp (set /p GIT_COMMITTER_DATE=)
36+
del _date.tmp
37+
38+
ECHO Committer date for tag: %GIT_COMMITTER_DATE%
39+
ECHO Overriding tag '%1' with text: %2
40+
ECHO.
41+
REM Override (with -af) the tag, if it exists (no quotes around %2)
42+
git tag -af %1 -m %2
43+
44+
ECHO.
45+
ECHO Updated tag:
46+
git tag --points-at HEAD -n
47+
ECHO.
48+
49+
REM Push to remove and override (with --force)
50+
ECHO Push changes to remote
51+
git push --tags --force
52+
53+
REM Go back to original HEAD
54+
ECHO.
55+
ECHO Back to original HEAD
56+
git checkout -
57+
58+
ECHO.
59+
ECHO List of all tags
60+
git tag -n

0 commit comments

Comments
 (0)