Skip to content

Commit

Permalink
Rename default OTel branch to main (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjanotti authored Jan 28, 2021
1 parent dd306ab commit 65add2a
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/benchmarks.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- refs/tags/*

variables:
Expand Down
4 changes: 2 additions & 2 deletions .azure-pipelines/integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
trigger:
branches:
include:
- master
- main
paths:
exclude:
- docs/*
- .github/*
pr:
branches:
include:
- master
- main
- release/*
paths:
exclude:
Expand Down
8 changes: 4 additions & 4 deletions .azure-pipelines/packages.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
trigger:
branches:
include:
- master
- main
- refs/tags/*
pr: none

Expand Down Expand Up @@ -253,11 +253,11 @@ stages:
env:
SECRET: $(AWS_SECRET_ACCESS_KEY)

# by default, run this step on master branch only.
# by default, run this step on main branch only.
# use "push_artifacts_to_s3" to override:
# "true": run this step
# "false": do NOT run this step
# else: run this stage if branch is master
# else: run this stage if branch is main

- script: aws s3 cp s3_upload s3://datadog-reliability-env/dotnet/ --recursive
displayName: Upload deb, MSI, index.txt to s3
Expand All @@ -267,6 +267,6 @@ stages:
ne(variables['push_artifacts_to_s3'], 'false'),
or(
eq(variables['push_artifacts_to_s3'], 'true'),
eq(variables['Build.SourceBranch'], 'refs/heads/master')
eq(variables['Build.SourceBranch'], 'refs/heads/main')
)
)
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#####################################################
#
# Learn about membership in OpenTelemetry community:
# https://github.com/open-telemetry/community/blob/master/community-membership.md
# https://github.com/open-telemetry/community/blob/main/community-membership.md
#
#
# Learn about CODEOWNERS file format:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Approvers ([@open-telemetry/dotnet-instrumentation-approvers](https://github.com
- [Tony Redondo](https://github.com/tonyredondo), Datadog
- [Zach Montoya](https://github.com/zacharycmontoya), Datadog

Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/master/community-membership.md).
Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md).
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
# https://aka.ms/yaml

trigger:
- master
- main
pr:
- master
- main

pool:
vmImage: 'ubuntu-latest'
Expand Down
2 changes: 1 addition & 1 deletion docs/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributor Code of Conduct

This project follows the code of conduct used by the
OpenTelemetry [community](https://github.com/open-telemetry/community/blob/master/code-of-conduct.md).
OpenTelemetry [community](https://github.com/open-telemetry/community/blob/main/code-of-conduct.md).
12 changes: 6 additions & 6 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ Join the meeting or get in touch on

Even though, anybody can contribute, there are benefits of being a member of
our community. See to the [community membership
document](https://github.com/open-telemetry/community/blob/master/community-membership.md)
document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
on how to become a
[**Member**](https://github.com/open-telemetry/community/blob/master/community-membership.md#member),
[**Approver**](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver)
[**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
and
[**Maintainer**](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer).
[**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).

## Report a bug or requesting feature

Expand All @@ -45,9 +45,9 @@ Reporting bugs is an important contribution. Please make sure to include:
### Before you start

Please read the
[contribution guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md)
[contribution guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
and the
[code of conduct](https://github.com/open-telemetry/community/blob/master/code-of-conduct.md).
[code of conduct](https://github.com/open-telemetry/community/blob/main/code-of-conduct.md).
for general practices of the OpenTelemetry project.

Select a good issue from the links below (ordered by difficulty/complexity):
Expand Down

0 comments on commit 65add2a

Please sign in to comment.