Skip to content

chore: replace "master" with "main" #7841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 102 commits into
base: master
Choose a base branch
from

Conversation

biru-codeastromer
Copy link
Contributor

Fixes #7126

Description:

This PR replaces all instances of master with main in the codebase, documentation, and GitHub workflows.

Changes include:

  • Updated Jenkinsfiles.
  • Updated documentation (README.adoc, CONTRIBUTING.adoc).
  • Updated GitHub workflows and configurations.

Please review and let me for further improvements !

@biru-codeastromer biru-codeastromer changed the title chore: replace master with main #7126 chore: replace master with main Feb 2, 2025
@biru-codeastromer
Copy link
Contributor Author

updated the branch .

@MarkEWaite
Copy link
Contributor

This seems like a lot of work with many, many opportunities for issues, without me being confident that @biru-codeastromer is ready for the weeks or months of issues that will result from the change.

Have you checked the other documentation generation locations that contribute to the jenkins.io site, like the backend extension indexer and the pipeline steps documentation generator? Have you investigated the changelog generator tooling to confirm that it will continue to submit pull requests that are targeting the correct branch?

@biru-codeastromer
Copy link
Contributor Author

biru-codeastromer commented Feb 4, 2025

This seems like a lot of work with many, many opportunities for issues, without me being confident that @biru-codeastromer is ready for the weeks or months of issues that will result from the change.

Have you checked the other documentation generation locations that contribute to the jenkins.io site, like the backend extension indexer and the pipeline steps documentation generator? Have you investigated the changelog generator tooling to confirm that it will continue to submit pull requests that are targeting the correct branch?

Hi Sir ,

Thanks for your constructive feedback! I completely understand that such a broad change comes with long-term implications, and I appreciate your insights and concerns.

Regarding your concerns:
-I haven’t yet checked the backend extension indexer and pipeline steps documentation generator. I will investigate these and provide an update.
-I’ll verify whether the changelog generator will still correctly submit PRs to the correct branch and ensure no unintended side effects.

I thought it would be better to raise a PR for improvements, so I prepared this as a draft to initiate discussions and track areas that need further research. Since there’s still work and investigation left, you can keep this PR in draft mode while I continue my research.

If you believe this is doable for me, I’d be happy to continue working on it.

Thanks again Sir for your valuable feedback! Much appreaciated

@zbynek
Copy link
Contributor

zbynek commented Feb 4, 2025

The list of files in #7126 also includes the issue templates, I think they should be included in the PR.

@biru-codeastromer
Copy link
Contributor Author

The list of files in #7126 also includes the issue templates, I think they should be included in the PR.

Thanks for the feedback ! Will be including them in the PR now .

@biru-codeastromer
Copy link
Contributor Author

The list of files in #7126 also includes the issue templates, I think they should be included in the PR.

I have added !

@biru-codeastromer
Copy link
Contributor Author

this file : "jenkins.io/updatecli/values.github-action.yaml" too has it as :

github:
  user: "GitHub Actions"
  email: "41898282+github-actions[bot]@users.noreply.github.com"
  username: "github-actions"
  token: "UPDATECLI_GITHUB_TOKEN"
  branch: "master"
  owner: "jenkins-infra"
  repository: "jenkins.io"

@kmartens27
Copy link
Contributor

Hi @biru-codeastromer, is this intended to just be the jenkins.io github repo documentation update, or would the jenkins.io documentation pages be updated in this PR as well? I ask because when reviewing the documentation on jenkins.io, there are several uses of the master URL that would be updated here.

If that will be a separate PR, please let me know and I'm happy to help gather all the usages and create a draft PR to make the accompanying updates.

Copy link
Contributor

Please take a moment and address the merge conflicts of your pull request. Thanks!

@biru-codeastromer
Copy link
Contributor Author

for my latest pr , the conflicts came here will be fixing it now

@github-actions github-actions bot removed the unresolved-merge-conflict There is a merge conflict with the target branch. label May 15, 2025
@biru-codeastromer
Copy link
Contributor Author

done !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
artwork blogpost changelog Jenkins changelogs chore documentation Jenkins documentation, including user and developer docs, solution pages, etc. governance gsoc roadmap The change is related to the public roadmap. https://jenkins.io/project/roadmap/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use main as primary branch
7 participants