Skip to content

Commit 96516ae

Browse files
authored
Migration to using main branch (onnx#3925)
* add warning announce Signed-off-by: Chun-Wei Chen <[email protected]> * Rename to main branch globally Signed-off-by: Chun-Wei Chen <[email protected]>
1 parent 6053123 commit 96516ae

36 files changed

+102
-99
lines changed

.azure-pipelines/Linux-CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trigger:
2-
- master
2+
- main
33

44
jobs:
55
- job: 'Test'

.azure-pipelines/MacOS-CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trigger:
2-
- master
2+
- main
33

44
jobs:
55
- job: 'Test'

.azure-pipelines/Windows-CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trigger:
2-
- master
2+
- main
33

44
jobs:
55

.github/workflows/release_linux_aarch64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
# Run weekly on Monday 00:00
66
- cron: '00 00 * * MON'
77
push:
8-
branches: [master, rel-*]
8+
branches: [main, rel-*]
99
pull_request:
10-
branches: [rel-*, master]
10+
branches: [main, rel-*]
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/release_linux_i686.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
# Run weekly on Monday 00:00
66
- cron: '00 00 * * MON'
77
push:
8-
branches: [master, rel-*]
8+
branches: [main, rel-*]
99
pull_request:
10-
branches: [master, rel-*]
10+
branches: [main, rel-*]
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/release_linux_x86_64.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
# Run weekly on Monday 00:00
66
- cron: '00 00 * * MON'
77
push:
8-
branches: [master, rel-*]
8+
branches: [main, rel-*]
99
pull_request:
10-
branches: [master, rel-*]
10+
branches: [main, rel-*]
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/release_mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
# Run weekly on Monday 00:00
66
- cron: '00 00 * * MON'
77
push:
8-
branches: [master, rel-*]
8+
branches: [main, rel-*]
99
pull_request:
10-
branches: [master, rel-*]
10+
branches: [main, rel-*]
1111
workflow_dispatch:
1212

1313
# Use MACOSX_DEPLOYMENT_TARGET=10.12 to produce compatible wheel

.github/workflows/release_win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55
# Run weekly on Monday 00:00
66
- cron: '00 00 * * MON'
77
push:
8-
branches: [master, rel-*]
8+
branches: [main, rel-*]
99
pull_request:
10-
branches: [master, rel-*]
10+
branches: [main, rel-*]
1111
workflow_dispatch:
1212

1313
jobs:

.github/workflows/weekly_mac_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
# run weekly on Sunday 23:59
99
- cron: '59 23 * * SUN'
1010
pull_request:
11-
branches: [master, rel-*]
11+
branches: [main, rel-*]
1212
workflow_dispatch:
1313

1414
jobs:

.github/workflows/win_no_exception_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Windows_No_Exception_CI
22

33
on:
44
push:
5-
branches: [ master, rel-* ]
5+
branches: [ main, rel-* ]
66
pull_request:
7-
branches: [ master, rel-* ]
7+
branches: [ main, rel-* ]
88
jobs:
99
build:
1010
runs-on: windows-latest

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Attend ONNX Steering Committee meetings - they are open to all in the community.
2424

2525
## Contributing code
2626

27-
You can submit a pull request (PR) with your code. The [SIG](https://github.com/onnx/onnx/blob/master/community/sigs.md) or [Working Group](https://github.com/onnx/onnx/blob/master/community/working-groups.md) that is responsible for the area of the project your PR touches will review it and merge once any comments are addressed.
27+
You can submit a pull request (PR) with your code. The [SIG](community/sigs.md) or [Working Group](community/working-groups.md) that is responsible for the area of the project your PR touches will review it and merge once any comments are addressed.
2828

2929
### DCO
3030
ONNX has adopted the [DCO](https://en.wikipedia.org/wiki/Developer_Certificate_of_Origin). All code repositories under ONNX require a DCO. (ONNX previously used a CLA, which is being replaced with the DCO.)
@@ -38,7 +38,7 @@ NOTE: the sign-off is needed for each commit in the PR, not at the PR level.
3838
If you have old commits that are not signed, use the following commands to squash the old PR (original branch) into a single commit. This is an easier way to signoff old commits in old PR.
3939

4040
```bash
41-
git checkout master
41+
git checkout main
4242
git checkout -b temporary_patch # create a new branch as temporary
4343
git merge --squash original_patch # copy from old branch
4444
git branch -d original_patch # remove old branch

README.md

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--- SPDX-License-Identifier: Apache-2.0 -->
22

3-
<p align="center"><img width="40%" src="https://github.com/onnx/onnx/raw/master/docs/ONNX_logo_main.png" /></p>
3+
<p align="center"><img width="40%" src="https://github.com/onnx/onnx/raw/main/docs/ONNX_logo_main.png" /></p>
44

5-
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/7?label=Linux&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=7&branchName=master)
6-
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/5?label=Windows&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=5&branchName=master)
7-
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/6?label=MacOS&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=6&branchName=master)
5+
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/7?label=Linux&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=7&branchName=main)
6+
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/5?label=Windows&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=5&branchName=main)
7+
[![Build Status](https://img.shields.io/azure-devops/build/onnx-pipelines/onnx/6?label=MacOS&logo=Azure-Pipelines)](https://dev.azure.com/onnx-pipelines/onnx/_build/latest?definitionId=6&branchName=main)
88
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3313/badge)](https://bestpractices.coreinfrastructure.org/projects/3313)
99

1010
[Open Neural Network Exchange (ONNX)](https://onnx.ai) is an open ecosystem that empowers AI developers
@@ -29,6 +29,9 @@ ONNX is [widely supported](http://onnx.ai/supported-tools) and can be found in m
2929
* [Graph Optimization](https://github.com/onnx/optimizer)
3030
* [Opset Version Conversion][version_converter]
3131

32+
# NOTICE: ONNX now uses main branch as default branch
33+
Here are the [steps](https://github.com/onnx/onnx/wiki/How-to-migrate-to-main-branch-in-local-repo) from ONNX wiki for migrating to main branch in local repo.
34+
3235
# Contribute
3336
ONNX is a [community project][community]. We encourage you to join the effort and contribute feedback, ideas, and code. You can participate in the [SIGs][sigs] and [Working Groups][wgs] to shape the future of ONNX.
3437

@@ -273,7 +276,7 @@ pytest
273276

274277
# Development
275278

276-
Check out the [contributor guide](https://github.com/onnx/onnx/blob/master/docs/CONTRIBUTING.md) for instructions.
279+
Check out the [contributor guide](https://github.com/onnx/onnx/blob/main/docs/CONTRIBUTING.md) for instructions.
277280

278281
# License
279282

@@ -289,17 +292,17 @@ NOTE: these are absolute rather than repo-relative because we
289292
this document is rendered by PyPI which doesn't seem to handle
290293
relative links properly. See https://github.com/dhimmel/obonet/issues/12.
291294
-->
292-
[overview]: https://github.com/onnx/onnx/blob/master/docs/Overview.md
293-
[ir]: https://github.com/onnx/onnx/blob/master/docs/IR.md
294-
[versioning]: https://github.com/onnx/onnx/blob/master/docs/Versioning.md
295-
[operators]: https://github.com/onnx/onnx/blob/master/docs/Operators.md
296-
[python_api]: https://github.com/onnx/onnx/blob/master/docs/PythonAPIOverview.md
297-
[shape_inference]: https://github.com/onnx/onnx/blob/master/docs/ShapeInference.md
298-
[version_converter]: https://github.com/onnx/onnx/blob/master/docs/VersionConverter.md
299-
[new_op]: https://github.com/onnx/onnx/blob/master/docs/AddNewOp.md
300-
[community]: https://github.com/onnx/onnx/tree/master/community
301-
[sigs]: https://github.com/onnx/onnx/tree/master/community/sigs.md
302-
[wgs]: https://github.com/onnx/onnx/tree/master/community/working-groups.md
303-
[contributing]: https://github.com/onnx/onnx/blob/master/docs/CONTRIBUTING.md
304-
[CMakeLists]: https://github.com/onnx/onnx/blob/master/CMakeLists.txt
305-
[license]: https://github.com/onnx/onnx/blob/master/LICENSE
295+
[overview]: https://github.com/onnx/onnx/blob/main/docs/Overview.md
296+
[ir]: https://github.com/onnx/onnx/blob/main/docs/IR.md
297+
[versioning]: https://github.com/onnx/onnx/blob/main/docs/Versioning.md
298+
[operators]: https://github.com/onnx/onnx/blob/main/docs/Operators.md
299+
[python_api]: https://github.com/onnx/onnx/blob/main/docs/PythonAPIOverview.md
300+
[shape_inference]: https://github.com/onnx/onnx/blob/main/docs/ShapeInference.md
301+
[version_converter]: https://github.com/onnx/onnx/blob/main/docs/VersionConverter.md
302+
[new_op]: https://github.com/onnx/onnx/blob/main/docs/AddNewOp.md
303+
[community]: https://github.com/onnx/onnx/blob/main/community
304+
[sigs]: https://github.com/onnx/onnx/blob/main/community/sigs.md
305+
[wgs]: https://github.com/onnx/onnx/blob/main/community/working-groups.md
306+
[contributing]: https://github.com/onnx/onnx/blob/main/docs/CONTRIBUTING.md
307+
[CMakeLists]: https://github.com/onnx/onnx/blob/main/CMakeLists.txt
308+
[license]: https://github.com/onnx/onnx/blob/main/LICENSE

RELEASE-MANAGEMENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Releases are versioned according to [ONNX Versioning](docs/Versioning.md). This
1111

1212
On a regular basis, new versions of ONNX are published, representing the aggregate of changes in the IR and operator sets. Such releases use semantic versioning to describe the progression of the standard.
1313

14-
The GitHub repo for ONNX provides release branches where the project is stabilized as per the process described here. Release notes are used to communicate the stability and status of a release. The master branch will be used to continue work for subsequent releases.
14+
The GitHub repo for ONNX provides release branches where the project is stabilized as per the process described here. Release notes are used to communicate the stability and status of a release. The main branch will be used to continue work for subsequent releases.
1515

1616
Major, minor and patch releases will have branch names and version numbers reflecting the nature of the change as per semantic versioning definitions.
1717

@@ -33,7 +33,7 @@ to be produced.
3333

3434
- The release manager announces the initial commit for testing. The first
3535
period lasts a week; any regressions found should be fixed, typically via
36-
the master branch. Incomplete features should be done or excised during this
36+
the main branch. Incomplete features should be done or excised during this
3737
period. A distribution can be made available with an -RC1 suffix.
3838

3939
- The release manager announces a second round of testing (unless it's only a

community/sc-election-guidelines.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
## Introduction
66

7-
To encourage community participation and wider adoption in the industry, ONNX has introduced [open governance](https://github.com/onnx/onnx/wiki/Expanded-ONNX-Steering-Committee-Announced!) in March 2018. The governance has three defined structures to propel the development of ONNX project forward: [Steering Committee](https://github.com/onnx/onnx/tree/master/community#steering-committee), [Special Interest Groups (SIGs)](https://github.com/onnx/onnx/tree/master/community#sig---special-interest-groups), and [Working Groups (WGs)](https://github.com/onnx/onnx/tree/master/community#wg---working-groups). While SIGs and WGs primarily focus on the techinical roadmap of ONNX, the Steering Committe is responsible for setting the vision and governance process of the ONNX community.
7+
To encourage community participation and wider adoption in the industry, ONNX has introduced [open governance](https://github.com/onnx/onnx/wiki/Expanded-ONNX-Steering-Committee-Announced!) in March 2018. The governance has three defined structures to propel the development of ONNX project forward: [Steering Committee](/community/readme.md#steering-committee), [Special Interest Groups (SIGs)](/community/readme.md#sig---special-interest-groups), and [Working Groups (WGs)](/community/readme.md#wg---working-groups). While SIGs and WGs primarily focus on the techinical roadmap of ONNX, the Steering Committe is responsible for setting the vision and governance process of the ONNX community.
88

9-
For the first year of its ONNX open governance, representatives from Facebook, Microsoft, AWS, Intel and Nvidia are chosen to serve as the ONNX Steering Committee to help guide the project. The Steering Committee will be elected by the [Contributors](https://github.com/onnx/onnx/tree/master/community#community-roles) in its second year and will be re-elected every year.
9+
For the first year of its ONNX open governance, representatives from Facebook, Microsoft, AWS, Intel and Nvidia are chosen to serve as the ONNX Steering Committee to help guide the project. The Steering Committee will be elected by the [Contributors](/community/readme.md#community-roles) in its second year and will be re-elected every year.
1010

1111
This document is created to provide guidelines for the election process to ensure maximum transparency and fairness.
1212

@@ -28,7 +28,7 @@ Candidate applications will be accepted in April, and the election will be held
2828
## Eligibility
2929

3030
### Eligibility for Steering Committee candidacy
31-
Candidates will be self-nominated, and they do not necessarly need to be a [Contributor](https://github.com/onnx/onnx/tree/master/community#community-roles) to the ONNX project. The duties of the Steering Committee extend beyond simply contributing code to the ONNX project.
31+
Candidates will be self-nominated, and they do not necessarly need to be a [Contributor](/community/readme.md#community-roles) to the ONNX project. The duties of the Steering Committee extend beyond simply contributing code to the ONNX project.
3232

3333

3434
### Eligibility for voting

community/sigs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# SIGs - Special Interest Groups
44

5-
As described in the ONNX [governance](https://github.com/onnx/onnx/tree/master/community#sig---special-interest-groups), Special Interest Groups (SIGs) are persistent groups responsible for specific parts of the project. SIGs have open and transparent proceedings to develop goals and implement code contributions. SIGs are also responsible for ongoing maintenance of the code in their areas.
5+
As described in the ONNX [governance](/community/readme.md#sig---special-interest-groups), Special Interest Groups (SIGs) are persistent groups responsible for specific parts of the project. SIGs have open and transparent proceedings to develop goals and implement code contributions. SIGs are also responsible for ongoing maintenance of the code in their areas.
66

77
## Joining a SIG
88

community/working-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Working Groups
44

5-
As described in the ONNX [governance](https://github.com/onnx/onnx/tree/master/community#wg---working-groups), Working Groups (WGs) are temporary groups formed to address issues that cross SIG boundaries. Working Groups have a have a clear goal measured through specific deliverables and disband after the goal is achieved. Working groups do not own artifacts long term; they create specifications, recommendations, and/or code implementations for submission to the relevant SIGs for approval and acceptance.
5+
As described in the ONNX [governance](/community/readme.md#wg---working-groups), Working Groups (WGs) are temporary groups formed to address issues that cross SIG boundaries. Working Groups have a have a clear goal measured through specific deliverables and disband after the goal is achieved. Working groups do not own artifacts long term; they create specifications, recommendations, and/or code implementations for submission to the relevant SIGs for approval and acceptance.
66

77
## Proposing a new working group
88
New Working Groups are created when there is sufficient interest in a topic area and someone volunteers to be the chair for the group and submits a proposal to the steering committee. The chair facilitates the discussion and helps synthesize proposals and decisions.

0 commit comments

Comments
 (0)