chore: Switch default branch references from master to main #68597
Conversation
- Update all GitHub Actions workflows to reference 'main' instead of 'master' - Update documentation files to reference 'main' branch - Update Python scripts and configuration files in airbyte-ci - Update CDK files and shell scripts - Update Makefiles and other build configuration files This change prepares the repository for switching the default branch from 'master' to 'main'. Co-Authored-By: AJ Steers <[email protected]>
Original prompt from AJ Steers |
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
👋 Greetings, Airbyte Team Member!Here are some helpful tips and reminders for your convenience. Helpful Resources
PR Slash CommandsAirbyte Maintainers (that's you!) can execute the following slash commands on your PR:
|
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| - The **Start Date** does not apply to the streams below and all data will be synced for these streams: `assignees`, `branches`, `collaborators`, `issue_labels`, `organizations`, `pull_request_commits`, `pull_request_stats`, `repositories`, `tags`, `teams`, `users` | ||
|
|
||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/master`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/master airbytehq/airbyte/my-branch`). | ||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/main`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/main airbytehq/airbyte/my-branch`). |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD029/ol-prefix Ordered list item prefix [Expected: 1; Actual: 8; Style: 1/1/1]
| 1. **(Optional) Create a Master Encryption Key** | ||
| If your environment requires a master key to store credentials securely, create one: | ||
| If your environment requires a main key to store credentials securely, create one: | ||
| ```sql |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| ```sql | |
| ```sql |
| @@ -1,13 +1,13 @@ | |||
| # Buzzsprout | |||
| This page contains the setup guide and reference information for the [Buzzsprout](https://www.buzzsprout.com/) source connector. | |||
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| This page contains the setup guide and reference information for the [Buzzsprout](https://www.buzzsprout.com/) source connector. | |
| This page contains the setup guide and reference information for the [Buzzsprout](https://www.buzzsprout.com/) source connector. |
| # Buzzsprout | ||
| This page contains the setup guide and reference information for the [Buzzsprout](https://www.buzzsprout.com/) source connector. | ||
|
|
||
| ## Documentation reference: |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| ## Documentation reference: | |
| ## Documentation reference | |
| Visit `https://github.com/buzzsprout/buzzsprout-api/tree/main/sections` for API documentation | ||
|
|
||
| ## Authentication setup | ||
| `Source-buzzsprout` uses API keys and podcast id for its authentication, |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| `Source-buzzsprout` uses API keys and podcast id for its authentication, | |
| `Source-buzzsprout` uses API keys and podcast id for its authentication, |
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/master`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/master airbytehq/airbyte/my-branch`). | ||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/main`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/main airbytehq/airbyte/my-branch`). | ||
|
|
||
| ### For Airbyte Open Source: |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| ### For Airbyte Open Source: | |
| ### For Airbyte Open Source |
|  | ||
|  | ||
|
|
||
|
|
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| ##### Default paths and conventions | ||
|
|
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| ##### Default paths and conventions | |
| ##### Default paths and conventions | |
| - [Regression Tests](https://github.com/airbytehq/airbyte/tree/master/airbyte-ci/connectors/live-tests): Connector-agnostic tests that verify that the behavior of a connector hasn’t changed unexpectedly between connector versions. A sandbox cloud connection is required. Currently only available for API source connectors. | ||
| - [Regression Tests](https://github.com/airbytehq/airbyte/tree/main/airbyte-ci/connectors/live-tests): Connector-agnostic tests that verify that the behavior of a connector hasn’t changed unexpectedly between connector versions. A sandbox cloud connection is required. Currently only available for API source connectors. | ||
|
|
||
|
|
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| - The **Start Date** does not apply to the streams below and all data will be synced for these streams: `assignees`, `branches`, `collaborators`, `issue_labels`, `organizations`, `pull_request_commits`, `pull_request_stats`, `repositories`, `tags`, `teams`, `users` | ||
|
|
||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/master`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/master airbytehq/airbyte/my-branch`). | ||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/main`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/main airbytehq/airbyte/my-branch`). |
There was a problem hiding this comment.
🚫 [vale] reported by reviewdog 🐶
[Google.Latin] Use 'for example' instead of 'e.g.'.
| - The **Start Date** does not apply to the streams below and all data will be synced for these streams: `assignees`, `branches`, `collaborators`, `issue_labels`, `organizations`, `pull_request_commits`, `pull_request_stats`, `repositories`, `tags`, `teams`, `users` | ||
|
|
||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/master`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/master airbytehq/airbyte/my-branch`). | ||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/main`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/main airbytehq/airbyte/my-branch`). |
There was a problem hiding this comment.
[Google.Will] Avoid using 'will'.
| - The **Start Date** does not apply to the streams below and all data will be synced for these streams: `assignees`, `branches`, `collaborators`, `issue_labels`, `organizations`, `pull_request_commits`, `pull_request_stats`, `repositories`, `tags`, `teams`, `users` | ||
|
|
||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/master`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/master airbytehq/airbyte/my-branch`). | ||
| 8. **Branch (Optional)** - List of GitHub repository branches to pull commits from, e.g. `airbytehq/airbyte/main`. If no branches are specified for a repository, the default branch will be pulled. (e.g. `airbytehq/airbyte/main airbytehq/airbyte/my-branch`). |
There was a problem hiding this comment.
🚫 [vale] reported by reviewdog 🐶
[Google.Latin] Use 'for example' instead of 'e.g.'.
| | 0.1.18 | 2022-08-01 | [14213](https://github.com/airbytehq/airbyte/pull/14213) | Add support for jsonl format files. | | ||
| | 0.1.17 | 2022-07-21 | [14911](https://github.com/airbytehq/airbyte/pull/14911) | "decimal" type added for parquet | | ||
| | 0.1.16 | 2022-07-13 | [14669](https://github.com/airbytehq/airbyte/pull/14669) | Fixed bug when extra columns apeared to be non-present in master schema | | ||
| | 0.1.16 | 2022-07-13 | [14669](https://github.com/airbytehq/airbyte/pull/14669) | Fixed bug when extra columns apeared to be non-present in main schema | |
There was a problem hiding this comment.
🚫 [vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'apeared'?
| ## Prerequisites | ||
|
|
||
| No prerequisites, but a dummy api_key is required as it enhances security in future build. Please check the available routes at [SpaceX Routes](https://github.com/r-spacex/SpaceX-API/tree/master/routes). | ||
| No prerequisites, but a dummy api_key is required as it enhances security in future build. Please check the available routes at [SpaceX Routes](https://github.com/r-spacex/SpaceX-API/tree/main/routes). |
There was a problem hiding this comment.
🚫 [vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'api_key'?
| ## Acknowledgements | ||
|
|
||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/master/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. | ||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/main/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. |
There was a problem hiding this comment.
[Google.We] Try to avoid using first-person plural like 'us'.
| ## Acknowledgements | ||
|
|
||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/master/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. | ||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/main/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. |
There was a problem hiding this comment.
[Google.We] Try to avoid using first-person plural like 'our'.
| ## Acknowledgements | ||
|
|
||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/master/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. | ||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/main/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. |
There was a problem hiding this comment.
[Google.We] Try to avoid using first-person plural like 'We'.
| ## Acknowledgements | ||
|
|
||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/master/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. | ||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/main/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. |
There was a problem hiding this comment.
[Google.We] Try to avoid using first-person plural like 'our'.
| ## Acknowledgements | ||
|
|
||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/master/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. | ||
| We'd like to note that we were initially inspired by Singer.io's [specification](https://github.com/singer-io/getting-started/blob/main/docs/SPEC.md#singer-specification) and would like to acknowledge that some of their design choices helped us bootstrap our project. We've since made a lot of modernizations to our protocol and specification, but don't want to forget the tools that helped us get started. |
There was a problem hiding this comment.
[Google.We] Try to avoid using first-person plural like 'us'.
Breaking changes: - CIContext.MASTER enum value changed from 'master' to 'main' - Default --diffed-branch parameter changed from 'master' to 'main' - GitHub URL references updated to use 'main' branch This is a major version bump due to the breaking API changes. Co-Authored-By: AJ Steers <[email protected]>
Document breaking changes in version 6.0.0: - CIContext.MASTER enum value change - Default --diffed-branch parameter change - GitHub URL references updated to main branch Co-Authored-By: AJ Steers <[email protected]>
|
|
||
| ## 6.0.0 - 2025-10-23 | ||
|
|
||
| ### Breaking Changes |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD022/blanks-around-headings Headings should be surrounded by blank lines [Expected: 1; Actual: 0; Below] [Context: "### Breaking Changes"]
| ## 6.0.0 - 2025-10-23 | ||
|
|
||
| ### Breaking Changes | ||
| - Changed `CIContext.MASTER` enum value from `"master"` to `"main"` to reflect repository default branch rename |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD032/blanks-around-lists Lists should be surrounded by blank lines [Context: "- Changed CIContext.MASTER e..."]
| - Updated GitHub URL references to use `main` branch instead of `master` | ||
| - Updated all comments and error messages referencing `master` branch to use `main` | ||
|
|
||
| ### Migration Guide |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD022/blanks-around-headings Headings should be surrounded by blank lines [Expected: 1; Actual: 0; Below] [Context: "### Migration Guide"]
|
|
||
| ### Migration Guide | ||
| If you have code that depends on the `CIContext.MASTER` enum value or the default `--diffed-branch` parameter: | ||
| - Update any code checking for `CIContext.MASTER == "master"` to check for `"main"` instead |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD032/blanks-around-lists Lists should be surrounded by blank lines [Context: "- Update any code checking for..."]
| - Update any explicit `--diffed-branch=master` arguments to use `--diffed-branch=main` | ||
| - Update any GitHub URLs referencing `/master/` to use `/main/` | ||
|
|
||
| ## 5.5.0 and earlier |
There was a problem hiding this comment.
[markdownlint] reported by reviewdog 🐶
MD022/blanks-around-headings Headings should be surrounded by blank lines [Expected: 1; Actual: 0; Below] [Context: "## 5.5.0 and earlier"]
| ## 6.0.0 - 2025-10-23 | ||
|
|
||
| ### Breaking Changes | ||
| - Changed `CIContext.MASTER` enum value from `"master"` to `"main"` to reflect repository default branch rename |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| - Changed `CIContext.MASTER` enum value from `"master"` to `"main"` to reflect repository default branch rename | |
| - Changed `CIContext.MASTER` enum value from `"master"` to `"main"` to reflect repository default branch rename |
| - Updated all comments and error messages referencing `master` branch to use `main` | ||
|
|
||
| ### Migration Guide | ||
| If you have code that depends on the `CIContext.MASTER` enum value or the default `--diffed-branch` parameter: |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| If you have code that depends on the `CIContext.MASTER` enum value or the default `--diffed-branch` parameter: | |
| If you have code that depends on the `CIContext.MASTER` enum value or the default `--diffed-branch` parameter: |
|
|
||
| ### Migration Guide | ||
| If you have code that depends on the `CIContext.MASTER` enum value or the default `--diffed-branch` parameter: | ||
| - Update any code checking for `CIContext.MASTER == "master"` to check for `"main"` instead |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| - Update any code checking for `CIContext.MASTER == "master"` to check for `"main"` instead | |
| - Update any code checking for `CIContext.MASTER == "master"` to check for `"main"` instead |
| - Update any GitHub URLs referencing `/master/` to use `/main/` | ||
|
|
||
| ## 5.5.0 and earlier | ||
| See git history for previous changes. |
There was a problem hiding this comment.
[markdownlint-fix] reported by reviewdog 🐶
| See git history for previous changes. | |
| See git history for previous changes. |
|
Deploy preview for airbyte-docs ready! ✅ Preview Built with commit a0fc07f. |
There was a problem hiding this comment.
Pull Request Overview
This PR updates all branch references from master to main throughout the repository in preparation for switching the default branch. This is a comprehensive find-and-replace operation that touches documentation, GitHub Actions workflows, Python scripts, CDK configuration files, and shell scripts.
Key changes:
- Updated default branch references in CI/CD workflows and automation scripts
- Changed branch name references in documentation and code comments
- Updated external repository links to use
maininstead ofmaster
Reviewed Changes
Copilot reviewed 125 out of 127 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| GitHub Actions workflows (17 files) | Updated branch triggers, conditional logic, and comments to reference main |
| Documentation files | Updated links, examples, and instructions to reference main branch |
| Python scripts in airbyte-ci | Changed default branch parameters, comments, and enum values |
| CDK YAML schemas | Updated schema ID URLs to point to main branch |
| Shell scripts | Changed default branch variables and git operations |
| Registry fixtures | Updated example branch names in connector configurations |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| [tool.poetry] | ||
| name = "pipelines" | ||
| version = "5.5.0" | ||
| version = "6.0.0" |
There was a problem hiding this comment.
Version bump to 6.0.0 appears unrelated to the branch rename changes described in the PR. If this is a breaking change due to the CIContext.MASTER enum value change, the version bump should be documented separately or the PR description should mention this is part of a larger release.
| version = "6.0.0" | |
| version = "5.0.0" # Reverted from 6.0.0; bump to 6.0.0 only if a breaking change is documented |
| @@ -0,0 +1,18 @@ | |||
| # Changelog | |||
|
|
|||
| ## 6.0.0 - 2025-10-23 | |||
There was a problem hiding this comment.
The changelog date '2025-10-23' is in the future. Based on the context that the current date is October 2025 and the knowledge cutoff is January 2025, this appears to be an invalid date. Please use the actual release date or current date.
| ## 6.0.0 - 2025-10-23 | |
| ## 6.0.0 - 2025-10-01 |
| | 0.1.1 | 2021-09-22 | [6315](https://github.com/airbytehq/airbyte/pull/6315) | Verify access to all sites when performing connection check | | ||
| | 0.1.0 | 2021-09-03 | [5350](https://github.com/airbytehq/airbyte/pull/5350) | Initial Release | | ||
| >>>>>>> master | ||
| >>>>>>> main |
There was a problem hiding this comment.
This line contains a git merge conflict marker that should be resolved. The '>>>>>>>' marker indicates unresolved merge conflicts in the file.
| >>>>>>> main |
| | 0.1.1 | 2021-09-22 | [6367](https://github.com/airbytehq/airbyte/pull/6367) | Add seller and vendor filters to profiles stream | | ||
| | 0.1.0 | 2021-08-13 | [5023](https://github.com/airbytehq/airbyte/pull/5023) | Initial version | | ||
| >>>>>>> master | ||
| >>>>>>> main |
There was a problem hiding this comment.
This line contains a git merge conflict marker that should be resolved. The '>>>>>>>' marker indicates unresolved merge conflicts in the file.
| >>>>>>> main |
What
This PR updates all references from the
masterbranch tomainthroughout the repository in preparation for switching the default branch. This was requested by AJ Steers (@aaronsteers) in this Slack thread.Link to Devin run: https://app.devin.ai/sessions/4b11a255e08a4cac95e63a8f4a8c3c3a
How
Used
sedwith word boundary regex (\bmaster\b) to replace all occurrences of "master" with "main" across:Total: 125 files changed, 252 insertions(+), 252 deletions(-)
Review guide
Critical items to verify:
External repository links - Check that links to other GitHub repos (especially
airbytehq/airbyte-protocol) that were changed frommastertomainare valid. If those repos haven't switched branches yet, these links will break.Workflow triggers - Verify the GitHub Actions workflow changes in
.github/workflows/:publish_connectors.yml(lines 6, 59-65) - now triggers onmaininstead ofmasterformat_check.yml(lines 9, 39, 50) - checks forrefs/heads/maininternal-airbyte-ci-release.yml(lines 74, 91, 104, 114) - conditional logic based onmainbranchGit operations - Scripts that fetch or diff against the branch:
poe-tasks/get-modified-connectors.sh(line 9)tools/bin/cdk-auto-release/update-bulk-cdk-version-in-connectors.sh(lines 6-29)tools/bin/cdk-auto-release/update-changelog.sh(lines 221-237)Coordination timing - This PR assumes the default branch will be renamed to
main. It needs to be merged in close coordination with the actual GitHub branch rename operation.User Impact
This change prepares the codebase for switching the default branch from
mastertomain. Once merged and the branch is renamed:mainbranchmainmainPotential negative side effects:
masterwill need updating by external partiesCan this PR be safely reverted and rolled back?
This is a mechanical find/replace change that can be safely reverted if needed. However, reverting would need to be coordinated with reverting the GitHub branch rename.