Skip to content

Commit bb9930b

Browse files
Merge from main
2 parents d3b6d69 + d0bd715 commit bb9930b

111 files changed

Lines changed: 16095 additions & 1995 deletions

File tree

Some content is hidden

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

.github/workflows/ci-build.yml

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
1-
name: Build and Tests
1+
name: 'Build and Test'
22

33
on:
44
push:
55
pull_request:
66
branches: [ main ]
77

88
jobs:
9-
build:
9+
Build:
10+
11+
name: 'Build and Test'
12+
runs-on: ubuntu-latest
1013
defaults:
1114
run:
1215
working-directory: ./src
13-
runs-on: ubuntu-latest
16+
1417
env:
1518
VSTEST_CONNECTION_TIMEOUT: 900
16-
19+
1720
steps:
18-
- uses: actions/checkout@v2
19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: |
23-
6.0.x
24-
- name: Install dependencies
25-
run: dotnet restore
26-
- name: Build
27-
run: dotnet build --configuration Release --no-restore
28-
- name: Test
29-
run: dotnet test --no-restore --verbosity normal
21+
- uses: actions/checkout@v2
22+
- name: Setup .NET Core
23+
uses: actions/setup-dotnet@v1
24+
with:
25+
dotnet-version: |
26+
3.1.x
27+
5.0.x
28+
6.0.x
29+
- name: Install dependencies
30+
run: dotnet restore
31+
- name: Build solution
32+
run: dotnet build -c Release --no-restore /p:Version=1.2.3.4
33+
- name: Test
34+
run: dotnet test -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=../coverage/
35+
- uses: codecov/codecov-action@v2
36+
if: ${{ github.event_name == 'push' }}
37+
with:
38+
token: ${{ secrets.CODECOV_TOKEN }}
39+
directory: src/coverage
40+
flags: unittests
41+
42+
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Run benchmark
2+
on:
3+
pull_request:
4+
branches: [ main ]
5+
6+
jobs:
7+
benchmark:
8+
name: Continuous benchmarking
9+
runs-on: ubuntu-latest
10+
11+
defaults:
12+
run:
13+
working-directory: ./src
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: Setup .NET Core
18+
uses: actions/setup-dotnet@v1
19+
with:
20+
dotnet-version: |
21+
3.1.x
22+
5.0.x
23+
6.0.x
24+
# Run benchmark with `go test -bench` and stores the output to a file
25+
- name: Run benchmark
26+
run: dotnet run --project ./GeoJSON.Text.Test.Benchmark/GeoJSON.Text.Test.Benchmark.csproj --framework net6 --runtimes net60 -c Release -- --job medium -f *SerializeAndDeserialize*
27+
# Download previous benchmark result from cache (if exists)
28+
- name: Download previous benchmark data
29+
uses: actions/cache@v1
30+
with:
31+
path: ./cache
32+
key: ${{ runner.os }}-benchmark
33+
# Run `github-action-benchmark` action
34+
- name: Store benchmark result
35+
uses: Happypig375/github-action-benchmark@v1
36+
with:
37+
# What benchmark tool the output.txt came from
38+
tool: 'benchmarkdotnet'
39+
# Where the output from the benchmark tool is stored
40+
output-file-path: 'src/BenchmarkDotNet.Artifacts/results/GeoJSON.Text.Test.Benchmark.SerializeAndDeserialize-report-full.json'
41+
# Where the previous data file is stored
42+
external-data-json-path: ./cache/benchmark-data.json
43+
# Will comment on pull request when an alert happens
44+
comment-always: true
45+
# GitHub API token to make a commit comment
46+
github-token: ${{ secrets.GITHUB_TOKEN }}
47+
# Upload the updated cache file for the next job by actions/cache
48+
# Run `github-action-benchmark` action

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,6 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
352+
353+
*.opencover.xml

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
[![Build and Test](https://github.com/GeoJSON-Net/GeoJSON.Text/actions/workflows/ci-build.yml/badge.svg?branch=main)](https://github.com/GeoJSON-Net/GeoJSON.Text/actions/workflows/ci-build.yml) [![codecov](https://codecov.io/gh/GeoJSON-Net/GeoJSON.Text/branch/main/graph/badge.svg?token=SE9XY1T8XO)](https://codecov.io/gh/GeoJSON-Net/GeoJSON.Text)
2+
3+
14
# GetJson.Text
25
.Net library for GeoJSON types & corresponding System.TExt.Json (de)serializers

src/Directory.Build.props

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

0 commit comments

Comments
 (0)