Skip to content

Commit 8f75a9b

Browse files
committed
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 <[email protected]>
1 parent 1d077d4 commit 8f75a9b

File tree

9 files changed

+28
-29
lines changed

9 files changed

+28
-29
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
jobs:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
# User-specific files
77
*.rsuser

.vscode/launch.json

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

CONTRIBUTING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ organized.
4545

4646
```console
4747
git fetch upstream
48-
git reset --hard upstream/master
49-
git checkout master
48+
git reset --hard upstream/main
49+
git checkout main
5050
git checkout -b fix-some-issue
5151
```
5252

@@ -102,19 +102,19 @@ Date: Thu Feb 2 11:41:15 2018 -0800
102102
Notice the `Author` and `Signed-off-by` lines match. If they don't your PR will
103103
be rejected by the automated DCO check.
104104

105-
## Staying Current with `master`
105+
## Staying Current with `main`
106106

107-
As you are working on your branch, changes may happen on `master`. Before
107+
As you are working on your branch, changes may happen on `main`. Before
108108
submitting your pull request, be sure that your branch has been updated
109109
with the latest commits.
110110

111111
```console
112112
git fetch upstream
113-
git rebase upstream/master
113+
git rebase upstream/main
114114
```
115115

116116
This may cause conflicts if the files you are changing on your branch are
117-
also changed on master. Error messages from `git` will indicate if conflicts
117+
also changed on main. Error messages from `git` will indicate if conflicts
118118
exist and what files need attention. Resolve the conflicts in each file, then
119119
continue with the rebase with `git rebase --continue`.
120120

@@ -131,15 +131,15 @@ git push -f origin fix-some-issue
131131
Before submitting a pull request, you should make sure that all of the tests
132132
successfully pass.
133133

134-
Once you have sent your pull request, `master` may continue to evolve
135-
before your pull request has landed. If there are any commits on `master`
134+
Once you have sent your pull request, `main` may continue to evolve
135+
before your pull request has landed. If there are any commits on `main`
136136
that conflict with your changes, you may need to update your branch with
137137
these changes before the pull request can land. Resolve conflicts the same
138138
way as before.
139139

140140
```console
141141
git fetch upstream
142-
git rebase upstream/master
142+
git rebase upstream/main
143143
# fix any potential conflicts
144144
git push -f origin fix-some-issue
145145
```
@@ -156,7 +156,7 @@ for details.
156156

157157
```console
158158
git commit -m "fixup: fix typo"
159-
git rebase -i upstream/master # follow git instructions
159+
git rebase -i upstream/main # follow git instructions
160160
```
161161

162162
Once you have rebased your commits, you can force push to your fork as before.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ provided within the documentation.
6464

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

src/CloudNative.CloudEvents/CloudEvent.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,15 @@ public object? this[string attributeName]
217217
/// and the 'schemaurl'. It is encoded into a media format which is specified by the
218218
/// 'contenttype' attribute (e.g. application/json).
219219
/// </summary>
220-
/// <see href="https://github.com/cloudevents/spec/blob/master/spec.md#data-1"/>
220+
/// <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#event-data"/>
221221
public object? Data { get; set; }
222222

223223
/// <summary>
224-
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/master/spec.md#id">'datacontenttype'</see> attribute.
224+
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#datacontenttype">'datacontenttype'</see> attribute.
225225
/// This is the content type of the <see cref="Data"/> property.
226226
/// This attribute enables the data attribute to carry any type of content, where the
227227
/// format and encoding might differ from that of the chosen event format.
228228
/// </summary>
229-
/// <see href="https://github.com/cloudevents/spec/blob/master/spec.md#contenttype"/>
230229
public string? DataContentType
231230
{
232231
// TODO: Guard against a version that doesn't have this attribute?
@@ -235,7 +234,7 @@ public string? DataContentType
235234
}
236235

237236
/// <summary>
238-
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/master/spec.md#id">'id'</see> attribute,
237+
/// CloudEvent <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#id">'id'</see> attribute,
239238
/// This is the ID of the event. When combined with <see cref="Source"/>, this enables deduplication.
240239
/// </summary>
241240
public string? Id
@@ -245,7 +244,7 @@ public string? Id
245244
}
246245

247246
/// <summary>
248-
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#dataschema">'dataschema'</see> attribute.
247+
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#dataschema">'dataschema'</see> attribute.
249248
/// A link to the schema that the data attribute adheres to.
250249
/// Incompatible changes to the schema SHOULD be reflected by a different URI.
251250
/// </summary>
@@ -256,7 +255,7 @@ public Uri? DataSchema
256255
}
257256

258257
/// <summary>
259-
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#source">'source'</see> attribute.
258+
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#source">'source'</see> attribute.
260259
/// This describes the event producer. Often this will include information such as the type of the event source, the
261260
/// organization publishing the event, the process that produced the event, and some unique identifiers.
262261
/// When combined with <see cref="Id"/>, this enables deduplication.
@@ -273,7 +272,7 @@ public Uri? Source
273272
// new CloudEvent(attributes.WithSpecVersion(newSpecVersion), Extensions.Values);
274273

275274
/// <summary>
276-
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#subject">'subject'</see> attribute.
275+
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#subject">'subject'</see> attribute.
277276
/// This describes the subject of the event in the context of the event producer (identified by <see cref="Source"/>).
278277
/// In publish-subscribe scenarios, a subscriber will typically subscribe to events emitted by a source,
279278
/// 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 @@ public string? Subject
286285
}
287286

288287
/// <summary>
289-
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#time">'time'</see> attribute.
288+
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#time">'time'</see> attribute.
290289
/// Timestamp of when the occurrence happened.
291290
/// </summary>
292291
public DateTimeOffset? Time
@@ -296,7 +295,7 @@ public DateTimeOffset? Time
296295
}
297296

298297
/// <summary>
299-
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/master/spec.md#type">'type'</see> attribute.
298+
/// CloudEvents <see href="https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md#type">'type'</see> attribute.
300299
/// Type of occurrence which has happened.
301300
/// Often this attribute is used for routing, observability, policy enforcement, etc.
302301
/// </summary>

src/CloudNative.CloudEvents/Extensions/Partitioning.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace CloudNative.CloudEvents.Extensions
1010
{
1111
/// <summary>
12-
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/partitioning.md">partitioning</see>
12+
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/partitioning.md">partitioning</see>
1313
/// CloudEvent extension.
1414
/// </summary>
1515
public static class Partitioning

src/CloudNative.CloudEvents/Extensions/Sampling.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace CloudNative.CloudEvents.Extensions
1111
{
1212
/// <summary>
13-
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/sampled-rate.md">sampling</see>
13+
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/sampledrate.md">sampling</see>
1414
/// CloudEvent extension.
1515
/// </summary>
1616
public static class Sampling

src/CloudNative.CloudEvents/Extensions/Sequence.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace CloudNative.CloudEvents.Extensions
1111
{
1212
/// <summary>
13-
/// Support for the <see href="https://github.com/cloudevents/spec/blob/master/extensions/sequence.md">sequence</see>
13+
/// Support for the <see href="https://github.com/cloudevents/spec/tree/main/cloudevents/extensions/sequence.md">sequence</see>
1414
/// CloudEvent extension.
1515
/// </summary>
1616
public static class Sequence

0 commit comments

Comments
 (0)