Skip to content
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

[bn] Update dev-bn branch with main #3290

Merged
merged 55 commits into from
Aug 20, 2024
Merged

[bn] Update dev-bn branch with main #3290

merged 55 commits into from
Aug 20, 2024

Conversation

asem-hamid
Copy link
Collaborator

@asem-hamid asem-hamid commented Aug 20, 2024

Describe your changes

Update dev-bn branch with main

Related issue number #410

Checklist before opening this PR (put x in the checkboxes)

  • This PR does not contain plagiarism
    • don’t copy other people’s work unless you are quoting and contributing it to them.
  • I have signed off on all commits
    • signing off (ex: git commit -s) is to affirm that commits comply DCO. If you are working locally, you could add an alias to your gitconfig by running git config --global alias.ci "commit -s".

jeanlouisferey and others added 30 commits January 11, 2024 18:05
Signed-off-by: Jean-Louis FEREY <jeanlouis.ferey@orange.com>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
[FR] Sync `dev-fr` branch with `main` branch
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Guillaume Bernard <guillaume.bernard@live.fr>
Signed-off-by: Guillaume BERNARD <guillaume.bernard@live.fr>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: p1000ans <148794313+p1000ans@users.noreply.github.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Sebastien Aucouturier <sebastien.aucouturier@gmail.com>
Signed-off-by: Guillaume BERNARD <guillaume.bernard@live.fr>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Guillaume BERNARD <guillaume.bernard@live.fr>
Signed-off-by: Guillaume BERNARD <guillaume.bernard@live.fr>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Asem Hamid <155321064+asem-hamid@users.noreply.github.com>
Signed-off-by: Asem Hamid <155321064+asem-hamid@users.noreply.github.com>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Stéphane Este-Gracias <sestegra@gmail.com>
Signed-off-by: Sully M <sullymartinezj@gmail.com>
Signed-off-by: Sully Martinez <sullymartinezj@gmail.com>
Signed-off-by: Sully Martinez <47094201+SullyMA@users.noreply.github.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Co-authored-by: Jossemar Cordero <jossemarGT@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Patrice Chalin <pchalin@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: EnriqueTejeda <quique.tejeda.68@gmail.com>
Signed-off-by: Enrique Tejeda <quique.tejeda.68@gmail.com>
Co-authored-by: Jossemar Cordero <jossemarGT@users.noreply.github.com>
Signed-off-by: Sully Martinez <sullymartinezj@gmail.com>
Co-authored-by: Victor Morales <chipahuac@hotmail.com>
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 5 to 6.
- [Release notes](https://github.com/dawidd6/action-download-artifact/releases)
- [Commits](dawidd6/action-download-artifact@v5...v6)

---
updated-dependencies:
- dependency-name: dawidd6/action-download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Copy link

netlify bot commented Aug 20, 2024

Deploy Preview for cncfglossary ready!

Name Link
🔨 Latest commit eb80a99
🔍 Latest deploy log https://app.netlify.com/sites/cncfglossary/deploys/66c4bb6cff19ce0008ad8644
😎 Deploy Preview https://deploy-preview-3290--cncfglossary.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions github-actions bot added lang/en for English lang/pt for Portuguese lang/es for Spanish lang/fr for French lang/ja for Japanese labels Aug 20, 2024
@iamNoah1
Copy link
Collaborator

can we have a second approve here @seokho-son, @jihoon-seo @nate-double-u ?!

Copy link
Member

@nate-double-u nate-double-u left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@nate-double-u
Copy link
Member

nate-double-u commented Aug 20, 2024

Even with @iamNoah1 and my approval, you'll also need approvals from the Bengali Codeowners:

glossary/CODEOWNERS

Lines 25 to 27 in eb80a99

# Approvers for Bengali contents
/content/bn/ @Arindam200 @asem-hamid @Imtiaz1234 @mitul3737 @sajibAdhi
/i18n/bn.toml @Arindam200 @asem-hamid @Imtiaz1234 @mitul3737 @sajibAdhi

Copy link
Collaborator

@mitul3737 mitul3737 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Collaborator

@Imtiaz1234 Imtiaz1234 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/LGTM

@nate-double-u
Copy link
Member

Interesting, it still says merging is blocked. I can merge it "without waiting for the req's to be met," but I'm curious why it thinks it's not allowing it automatically now. The system may want more locale codeowner approvals because it's hitting more than just the bn directory, but that check shouldn't happen on a dev branch.

@nate-double-u nate-double-u merged commit afb068f into dev-bn Aug 20, 2024
7 checks passed
@asem-hamid
Copy link
Collaborator Author

Thanks for merging @nate-double-u

@nate-double-u
Copy link
Member

nate-double-u commented Aug 20, 2024

I squashed this PR when I probably shouldn't have. @asem-hamid, I've pinged the maintainers channel for their opinion of what the best next step is, but I think that I should pull the dev-bn branch, remove the commit that this squash created, then force push back to dev-bn. I think that'll bring the branch back in line with where it was, but then we'll need to redo this PR. Sorry about this.

@iamNoah1 @seokho-son @jihoon-seo

@asem-hamid
Copy link
Collaborator Author

@nate-double-u oh no sweat , Please instruct me what I have to do from my end

@seokho-son
Copy link
Collaborator

Interesting, it still says merging is blocked. I can merge it "without waiting for the req's to be met," but I'm curious why it thinks it's not allowing it automatically now. The system may want more locale codeowner approvals because it's hitting more than just the bn directory, but that check shouldn't happen on a dev branch.

Hi @nate-double-u

Thanks for facilitating the PRs to sync the branches.
Since I’ve mostly handled this work on my own as one of the maintainers, I imagine there might have been some parts that seemed confusing to you. :)

  1. PR for Updating the dev-xx Branch (main -> dev-bn)
    Currently, the approvers are organized differently for each language (except for English). For example, bn content (/bn/*) is approved by bn content owners. So, when trying to merge the commits from main into dev-bn, many files in other languages are also added to dev-bn due to the various commits added to main over time. As a result, the code owners of languages other than bn need to approve the PR for it to pass the CI checks.
    However, these branch update PRs don’t actually require content reviews, so to prevent unnecessary stress for many reviewers, it has been agreed that the maintainer can force merge these without needing approval from each content reviewer. (I’ve primarily handled this)
    When merging these PRs, we avoid squashing the commits to retain the commit history, as they are unique commits in the main branch.

  2. PR for Merging Localization Work from dev-xx to main (dev-bn -> main)
    Modifications in the dev-bn branch only involve Bengali content. The Bengali approvers can only approve content within the /bn/* directory in any branch, including dev-bn.
    Therefore, for a PR that merges dev-bn into main, the approval of the Bengali approver is required, followed by an additional review from one of the maintainers before merging into main. (Occasionally, maintainers may make changes to other languages in the dev-bn branch as well.)
    If there are an excessive number of commits relative to the number of files modified, we consider that the commit history has not been well managed, and we perform a commit squashing before merging. If the commits are appropriate, then we simply merge as is.

  3. Overall...
    As you know, the related policies can be found in this discussion. Before a new reviewer/approver joins, we go through a process to ensure they understand these policies well.

@nate-double-u
Copy link
Member

OK, I'm going to drop the commit made in this PR (afb068f) locally, then force-push. This should reset dev-bn to where it was before I merged this. I think this'll be cleaner than doing a revert commit.

I'll have to take branch protections off temporarily while i do this, I'll let you know when it's done.

Unfortunately, we'll need to redo this PR. I'll update this thread when I've completed the update.

@nate-double-u
Copy link
Member

I've removed the commit that this PR made.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lang/en for English lang/es for Spanish lang/fr for French lang/ja for Japanese lang/pt for Portuguese
Projects
Development

Successfully merging this pull request may close these issues.