fix: Fix CI from the master to main change

docs: Update links to refer to main branch in the spec repo (and others)

Signed-off-by: Jon Skeet <jonskeet@google.com>
This commit is contained in:
Jon Skeet 2022-04-08 11:31:12 +01:00 committed by Jon Skeet
parent 1d077d4e57
commit 8f75a9b3cb
9 changed files with 28 additions and 29 deletions

View File

@ -3,7 +3,7 @@ name: Build
on:
push:
branches:
- master
- main
pull_request:
jobs:

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
# User-specific files
*.rsuser

2
.vscode/launch.json vendored
View File

@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests/bin/Debug/netcoreapp2.1/CloudNative.CloudEvents.UnitTests.dll",
"program": "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests/bin/Debug/netcoreapp3.1/CloudNative.CloudEvents.UnitTests.dll",
"args": [],
"cwd": "${workspaceFolder}/test/CloudNative.CloudEvents.UnitTests",
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

View File

@ -45,8 +45,8 @@ organized.
```console
git fetch upstream
git reset --hard upstream/master
git checkout master
git reset --hard upstream/main
git checkout main
git checkout -b fix-some-issue
```
@ -102,19 +102,19 @@ Date: Thu Feb 2 11:41:15 2018 -0800
Notice the `Author` and `Signed-off-by` lines match. If they don't your PR will
be rejected by the automated DCO check.
## Staying Current with `master`
## Staying Current with `main`
As you are working on your branch, changes may happen on `master`. Before
As you are working on your branch, changes may happen on `main`. Before
submitting your pull request, be sure that your branch has been updated
with the latest commits.
```console
git fetch upstream
git rebase upstream/master
git rebase upstream/main
```
This may cause conflicts if the files you are changing on your branch are
also changed on master. Error messages from `git` will indicate if conflicts
also changed on main. Error messages from `git` will indicate if conflicts
exist and what files need attention. Resolve the conflicts in each file, then
continue with the rebase with `git rebase --continue`.
@ -131,15 +131,15 @@ git push -f origin fix-some-issue
Before submitting a pull request, you should make sure that all of the tests
successfully pass.
Once you have sent your pull request, `master` may continue to evolve
before your pull request has landed. If there are any commits on `master`
Once you have sent your pull request, `main` may continue to evolve
before your pull request has landed. If there are any commits on `main`
that conflict with your changes, you may need to update your branch with
these changes before the pull request can land. Resolve conflicts the same
way as before.
```console
git fetch upstream
git rebase upstream/master
git rebase upstream/main
# fix any potential conflicts
git push -f origin fix-some-issue
```
@ -156,7 +156,7 @@ for details.
```console
git commit -m "fixup: fix typo"
git rebase -i upstream/master # follow git instructions
git rebase -i upstream/main # follow git instructions
```
Once you have rebased your commits, you can force push to your fork as before.

View File

@ -64,11 +64,11 @@ provided within the documentation.
Each SDK may have its own unique processes, tooling and guidelines, common
governance related material can be found in the
[CloudEvents `community`](https://github.com/cloudevents/spec/tree/master/community)
[CloudEvents `docs`](https://github.com/cloudevents/spec/tree/main/docs)
directory. In particular, in there you will find information concerning
how SDK projects are
[managed](https://github.com/cloudevents/spec/blob/master/community/SDK-GOVERNANCE.md),
[guidelines](https://github.com/cloudevents/spec/blob/master/community/SDK-maintainer-guidelines.md)
[managed](https://github.com/cloudevents/spec/blob/main/docs/SDK-GOVERNANCE.md),
[guidelines](https://github.com/cloudevents/spec/blob/main/docs/SDK-maintainer-guidelines.md)
for how PR reviews and approval, and our
[Code of Conduct](https://github.com/cloudevents/spec/blob/master/community/GOVERNANCE.md#additional-information)
[Code of Conduct](https://github.com/cloudevents/spec/blob/main/docs/GOVERNANCE.md#additional-information)
information.

View File

@ -217,16 +217,15 @@ namespace CloudNative.CloudEvents
/// and the 'schemaurl'. It is encoded into a media format which is specified by the
/// 'contenttype' attribute (e.g. application/json).
/// </summary>
/// <see href="https://github.com/cloudevents/spec/blob/master/spec.md#data-1"/>
/// <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#event-data"/>
public object? Data { get; set; }
/// <summary>
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/master/spec.md#id">'datacontenttype'</see> attribute.
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#datacontenttype">'datacontenttype'</see> attribute.
/// This is the content type of the <see cref="Data"/> property.
/// This attribute enables the data attribute to carry any type of content, where the
/// format and encoding might differ from that of the chosen event format.
/// </summary>
/// <see href="https://github.com/cloudevents/spec/blob/master/spec.md#contenttype"/>
public string? DataContentType
{
// TODO: Guard against a version that doesn't have this attribute?
@ -235,7 +234,7 @@ namespace CloudNative.CloudEvents
}
/// <summary>
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/master/spec.md#id">'id'</see> attribute,
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#id">'id'</see> attribute,
/// This is the ID of the event. When combined with <see cref="Source"/>, this enables deduplication.
/// </summary>
public string? Id
@ -245,7 +244,7 @@ namespace CloudNative.CloudEvents
}
/// <summary>
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#dataschema">'dataschema'</see> attribute.
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#dataschema">'dataschema'</see> attribute.
/// A link to the schema that the data attribute adheres to.
/// Incompatible changes to the schema SHOULD be reflected by a different URI.
/// </summary>
@ -256,7 +255,7 @@ namespace CloudNative.CloudEvents
}
/// <summary>
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#source">'source'</see> attribute.
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#source">'source'</see> attribute.
/// This describes the event producer. Often this will include information such as the type of the event source, the
/// organization publishing the event, the process that produced the event, and some unique identifiers.
/// When combined with <see cref="Id"/>, this enables deduplication.
@ -273,7 +272,7 @@ namespace CloudNative.CloudEvents
// new CloudEvent(attributes.WithSpecVersion(newSpecVersion), Extensions.Values);
/// <summary>
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#subject">'subject'</see> attribute.
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#subject">'subject'</see> attribute.
/// This describes the subject of the event in the context of the event producer (identified by <see cref="Source"/>).
/// In publish-subscribe scenarios, a subscriber will typically subscribe to events emitted by a source,
/// but the source identifier alone might not be sufficient as a qualifier for any specific event if the source context has
@ -286,7 +285,7 @@ namespace CloudNative.CloudEvents
}
/// <summary>
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#time">'time'</see> attribute.
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#time">'time'</see> attribute.
/// Timestamp of when the occurrence happened.
/// </summary>
public DateTimeOffset? Time
@ -296,7 +295,7 @@ namespace CloudNative.CloudEvents
}
/// <summary>
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#type">'type'</see> attribute.
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#type">'type'</see> attribute.
/// Type of occurrence which has happened.
/// Often this attribute is used for routing, observability, policy enforcement, etc.
/// </summary>

View File

@ -9,7 +9,7 @@ using System.Linq;
namespace CloudNative.CloudEvents.Extensions
{
/// <summary>
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/partitioning.md">partitioning</see>
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/partitioning.md">partitioning</see>
/// CloudEvent extension.
/// </summary>
public static class Partitioning

View File

@ -10,7 +10,7 @@ using System.Linq;
namespace CloudNative.CloudEvents.Extensions
{
/// <summary>
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/sampled-rate.md">sampling</see>
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/sampledrate.md">sampling</see>
/// CloudEvent extension.
/// </summary>
public static class Sampling

View File

@ -10,7 +10,7 @@ using System.Linq;
namespace CloudNative.CloudEvents.Extensions
{
/// <summary>
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/sequence.md">sequence</see>
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/sequence.md">sequence</see>
/// CloudEvent extension.
/// </summary>
public static class Sequence