Skip to content

Commit bb720c3

Browse files
timcasselltimcassell
committed
Merge branch 'master' into call-direct
# Conflicts: # src/BenchmarkDotNet/Templates/BenchmarkType.txt
2 parents b262565 + 60c3029 commit bb720c3

File tree

289 files changed

+4704
-8106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+4704
-8106
lines changed

‎CODE_OF_CONDUCT.md renamed to ‎.github/CODE_OF_CONDUCT.md

File renamed without changes.

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

File renamed without changes.

‎.github/workflows/build.yaml

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

‎.github/workflows/generate-changelog.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: generate-changelog
2+
run-name: Generate changelog / ${{ github.event.head_commit.message }}
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
workflow_dispatch:
9+
10+
permissions: write-all
11+
12+
jobs:
13+
generate:
14+
runs-on: ubuntu-latest
15+
steps:
16+
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
with:
20+
ref: master
21+
22+
- name: Download changelog
23+
run: ./build.cmd docs-update --depth 1 --preview
24+
env:
25+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26+
27+
- name: Push changelog
28+
uses: JamesIves/[email protected]
29+
with:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
BRANCH: docs-changelog-details
32+
FOLDER: docs/_changelog/details
33+
GIT_CONFIG_NAME: Andrey Akinshin
34+
GIT_CONFIG_EMAIL: [email protected]
35+
CLEAN: true

‎.github/workflows/docs-stable.yaml renamed to ‎.github/workflows/generate-gh-pages.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: docs-stable
1+
name: generate-gh-pages
2+
run-name: Generate gh-pages / ${{ github.event.head_commit.message }}
23

34
on:
45
push:
@@ -9,7 +10,7 @@ on:
910
permissions: write-all
1011

1112
jobs:
12-
build:
13+
generate:
1314
runs-on: windows-latest
1415
steps:
1516

@@ -19,17 +20,15 @@ jobs:
1920
ref: docs-stable
2021

2122
- name: Build BenchmarkDotNet
22-
run: ./build.bat --target Build
23+
run: ./build.cmd build
2324

24-
# Temporary disabled because of the API limit
25-
# - name: Download changelog
26-
# run: ./build.bat --target DocFX_Changelog_Download --LatestVersions true --StableVersions true
27-
# env:
28-
# GITHUB_PRODUCT: ChangelogBuilder
29-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
- name: Download changelog
26+
run: ./build.cmd docs-update --depth 1 --preview
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3029

3130
- name: Build documentation
32-
run: ./build.bat --target DocFX_Build
31+
run: ./build.cmd docs-build
3332

3433
- name: Upload Artifacts
3534
uses: actions/upload-artifact@v1
@@ -39,7 +38,7 @@ jobs:
3938

4039
deploy:
4140
concurrency: ci-${{ github.ref }}
42-
needs: [build]
41+
needs: [generate]
4342
runs-on: ubuntu-latest
4443
steps:
4544

‎.github/workflows/publish-nightly.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: publish-nightly
2+
run-name: Publish nightly nupkg / ${{ github.event.head_commit.message }}
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
9+
jobs:
10+
publish:
11+
runs-on: ubuntu-latest
12+
if: ${{ github.repository == 'dotnet/BenchmarkDotNet' }}
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Set date
16+
run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
17+
- name: Pack
18+
run: ./build.cmd pack /p:VersionSuffix=nightly.$DATE.$GITHUB_RUN_NUMBER
19+
- name: Upload nupkg to artifacts
20+
uses: actions/upload-artifact@v3
21+
with:
22+
name: nupkgs
23+
path: "**/*.nupkg"
24+
- name: Publish nupkg
25+
env:
26+
MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
27+
run: .dotnet/dotnet nuget push **/*.nupkg --source https://www.myget.org/F/benchmarkdotnet/api/v3/index.json --api-key $MYGET_API_KEY --timeout 600
28+
- name: Publish snupkg
29+
env:
30+
MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }}
31+
run: .dotnet/dotnet nuget push **/*.snupkg --source https://www.myget.org/F/benchmarkdotnet/api/v3/index.json --api-key $MYGET_API_KEY --timeout 600

‎.github/workflows/report-test-results.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: report-test-results
2+
run-name: Report test results for '${{ github.event.workflow_run.head_branch }}' / ${{ github.event.workflow_run.head_commit.message }}
3+
4+
on:
5+
workflow_run:
6+
workflows: [ 'run-tests' ]
7+
types:
8+
- completed
9+
10+
jobs:
11+
report:
12+
runs-on: ubuntu-latest
13+
permissions: write-all
14+
steps:
15+
- name: Download Artifacts
16+
uses: dawidd6/action-download-artifact@v2
17+
with:
18+
workflow: ${{ github.event.workflow_run.workflow_id }}
19+
- name: Display structure of downloaded files
20+
run: ls -R
21+
- name: Report tests results
22+
uses: AndreyAkinshin/test-reporter@0e2c48ebec2007001dd77dd4bcbcd450b96d5a38
23+
with:
24+
name: report
25+
path: "**/*.trx"
26+
reporter: dotnet-trx
27+
fail-on-error: true

‎.github/workflows/run-tests.yaml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: run-tests
2+
run-name: Run tests / ${{ github.event.head_commit.message }}
3+
4+
on:
5+
pull_request:
6+
push:
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
14+
test-windows-core:
15+
runs-on: windows-latest
16+
steps:
17+
- name: Disable Windows Defender
18+
run: Set-MpPreference -DisableRealtimeMonitoring $true
19+
shell: powershell
20+
- uses: actions/checkout@v3
21+
- name: Run task 'build'
22+
shell: cmd
23+
run: |
24+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
25+
./build.cmd build
26+
- name: Run task 'in-tests-core'
27+
shell: cmd
28+
run: |
29+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
30+
./build.cmd in-tests-core -e
31+
- name: Upload test results
32+
uses: actions/upload-artifact@v3
33+
if: always()
34+
with:
35+
name: test-windows-core-trx
36+
path: "**/*.trx"
37+
38+
test-windows-full:
39+
runs-on: windows-latest
40+
steps:
41+
- name: Disable Windows Defender
42+
run: Set-MpPreference -DisableRealtimeMonitoring $true
43+
shell: powershell
44+
- uses: actions/checkout@v3
45+
- name: Run task 'build'
46+
shell: cmd
47+
run: |
48+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
49+
./build.cmd build
50+
- name: Run task 'in-tests-full'
51+
shell: cmd
52+
run: |
53+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
54+
./build.cmd in-tests-full -e
55+
- name: Upload test results
56+
uses: actions/upload-artifact@v3
57+
if: always()
58+
with:
59+
name: test-windows-full-trx
60+
path: "**/*.trx"
61+
62+
test-linux:
63+
runs-on: ubuntu-latest
64+
steps:
65+
- uses: actions/checkout@v3
66+
- name: Set up Clang
67+
uses: egor-tensin/setup-clang@v1
68+
with:
69+
version: latest
70+
platform: x64
71+
- name: Set up zlib-static
72+
run: sudo apt-get install -y libkrb5-dev
73+
- name: Run task 'build'
74+
run: ./build.cmd build
75+
- name: Run task 'unit-tests'
76+
run: ./build.cmd unit-tests -e
77+
- name: Run task 'in-tests-core'
78+
run: ./build.cmd in-tests-core -e
79+
- name: Upload test results
80+
uses: actions/upload-artifact@v3
81+
if: always()
82+
with:
83+
name: test-linux-trx
84+
path: "**/*.trx"
85+
86+
test-macos:
87+
runs-on: macos-13
88+
steps:
89+
- uses: actions/checkout@v3
90+
- name: Run task 'build'
91+
run: ./build.cmd build
92+
- name: Run task 'unit-tests'
93+
run: ./build.cmd unit-tests -e
94+
- name: Run task 'in-tests-core'
95+
run: ./build.cmd in-tests-core -e
96+
- name: Upload test results
97+
uses: actions/upload-artifact@v3
98+
if: always()
99+
with:
100+
name: test-macos-trx
101+
path: "**/*.trx"
102+
103+
spellcheck-docs:
104+
runs-on: ubuntu-latest
105+
steps:
106+
- uses: actions/checkout@v3
107+
- uses: actions/setup-node@v1
108+
name: Setup node
109+
with:
110+
node-version: "16"
111+
- name: Install cSpell
112+
run: npm install -g cspell
113+
- name: Copy cSpell config
114+
run: cp ./build/cSpell.json ./cSpell.json
115+
- name: Run cSpell
116+
run: cspell --config ./cSpell.json "docs/**/*.md" --no-progress

‎.github/workflows/spellcheck.yml

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

0 commit comments

Comments
 (0)