Skip to content

Commit 5270ea9

Browse files
cuteantcuteant
authored
Merge pull request #49 from cuteant/workflows-target-main-branch
Workflows target main branch
2 parents 7a95725 + 84261aa commit 5270ea9

5 files changed

+22
-24
lines changed

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
# dotnetty-span-fork
1+
# SpanNetty
22

33
This is a fork of [DotNetty](https://github.com/azure/dotnetty).
44

55
## Build Status
66

77
| Stage | Status |
88
|-----------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
9-
| Build | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=Windows%20Build)](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) |
10-
| .NET Framework 451 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=.NET%20Framework%20451%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) |
11-
| .NET Framework 471 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=future&jobName=.NET%20Framework%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=future) |
12-
| .NET Core (Windows) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) |
13-
| .NET Core (Ubuntu 16.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-16))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) |
14-
| .NET Core (Ubuntu 18.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-18))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) |
15-
| .NET Core (macOS X Mojave 10.14) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.14))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) |
16-
| .NET Core (macOS X Catalina 10.15) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=future&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.15))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=future) |
17-
| .NET Netstandard (Windows) Unit Tests | [![Build status](https://ci.appveyor.com/api/projects/status/rvx3h1bmahad2giw/branch/future?svg=true)](https://ci.appveyor.com/project/cuteant/SpanNetty/branch/future) |
9+
| Build | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=Windows%20Build)](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) |
10+
| .NET Framework 451 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=.NET%20Framework%20451%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) |
11+
| .NET Framework 471 Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netfx-validation?branchName=main&jobName=.NET%20Framework%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=6&branchName=main) |
12+
| .NET Core (Windows) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Windows))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) |
13+
| .NET Core (Ubuntu 16.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-16))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) |
14+
| .NET Core (Ubuntu 18.04) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(Ubuntu-18))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) |
15+
| .NET Core (macOS X Mojave 10.14) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.14))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) |
16+
| .NET Core (macOS X Catalina 10.15) Unit Tests | [![Build Status](https://dev.azure.com/SpanNetty/SpanNetty/_apis/build/status/SpanNetty/pr-netcore-validation?branchName=main&jobName=.NET%20Core%20Unit%20Tests%20(MacOS-10.15))](https://dev.azure.com/SpanNetty/SpanNetty/_build/latest?definitionId=7&branchName=main) |
17+
| .NET Netstandard (Windows) Unit Tests | [![Build status](https://ci.appveyor.com/api/projects/status/rvx3h1bmahad2giw/branch/main?svg=true)](https://ci.appveyor.com/project/cuteant/SpanNetty/branch/main) |
1818

1919
## Features
2020
- Align with [Netty-4.1.51.Final](https://github.com/netty/netty/tree/netty-4.1.51.Final)
2121
- ArrayPooledByteBuffer
2222
- Support **Span<byte>** and **Memory<byte>** in Buffer/Common APIs
2323
- Add support for IBufferWriter<byte> to the **IByteBuffer**
24-
- [ByteBufferReader](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Buffers/Reader) and [ByteBufferWriter](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Buffers/Writer)
25-
- [HTTP 2 codec](https://github.com/cuteant/dotnetty-span-fork/tree/future/src/DotNetty.Codecs.Http2)
24+
- [ByteBufferReader](https://github.com/cuteant/spannetty/tree/main/src/DotNetty.Buffers/Reader) and [ByteBufferWriter](https://github.com/cuteant/dotnetty-span-fork/tree/main/src/DotNetty.Buffers/Writer)
25+
- [HTTP 2 codec](https://github.com/cuteant/spannetty/tree/main/src/DotNetty.Codecs.Http2)
2626

2727
## Use
2828

‎build.fsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let versionFromReleaseNotes =
3535

3636
let versionSuffix =
3737
match (getBuildParam "nugetprerelease") with
38-
| "future" -> preReleaseVersionSuffix
38+
| "main" -> preReleaseVersionSuffix
3939
| "" -> versionFromReleaseNotes
4040
| str -> str
4141

@@ -94,8 +94,8 @@ let getAffectedProjects =
9494
Target "ComputeIncrementalChanges" (fun _ ->
9595
if runIncrementally then
9696
let targetBranch = match getBuildParam "targetBranch" with
97-
| "" -> "future"
98-
| null -> "future"
97+
| "" -> "main"
98+
| null -> "main"
9999
| b -> b
100100
let incrementalistPath =
101101
let incrementalistDir = toolsDir @@ "incrementalist"

‎build/pr-netfx-validation.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
trigger:
44
branches:
55
include:
6-
- future
7-
- master
6+
- main
87
- release/*
98

109
pr:
1110
autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
1211
branches:
13-
include: [ future, master, release/* ] # branch names which will trigger a build
12+
include: [ main, release/* ] # branch names which will trigger a build
1413

1514
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
1615

‎build/pr-validation.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
trigger:
44
branches:
55
include:
6-
- future
7-
- master
6+
- main
87
- release/*
98

109
pr:
1110
autoCancel: true # indicates whether additional pushes to a PR should cancel in-progress runs for the same PR. Defaults to true
1211
branches:
13-
include: [ future, master, release/* ] # branch names which will trigger a build
12+
include: [ main, release/* ] # branch names which will trigger a build
1413

1514
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
1615

‎buildNetstandard.fsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ let versionFromReleaseNotes =
3535

3636
let versionSuffix =
3737
match (getBuildParam "nugetprerelease") with
38-
| "future" -> preReleaseVersionSuffix
38+
| "main" -> preReleaseVersionSuffix
3939
| "" -> versionFromReleaseNotes
4040
| str -> str
4141

@@ -93,8 +93,8 @@ let getAffectedProjects =
9393
Target "ComputeIncrementalChanges" (fun _ ->
9494
if runIncrementally then
9595
let targetBranch = match getBuildParam "targetBranch" with
96-
| "" -> "future"
97-
| null -> "future"
96+
| "" -> "main"
97+
| null -> "main"
9898
| b -> b
9999
let incrementalistPath =
100100
let incrementalistDir = toolsDir @@ "incrementalist"

0 commit comments

Comments
 (0)