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

remove manual DCO check (done by org-level check) #92

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

rursprung
Copy link
Contributor

the DCO check is activated directly on GitHub in the org-level settings for opensearch-project (see the GitHub documentation). there's no need for the duplicate check implemented in the workflow anymore.

other projects which are created based on the template which want a DCO check can also just enable this in their settings.

fixes #61

Description

Describe what this change achieves.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

the DCO check is activated directly on GitHub in the org-level settings
for `opensearch-project` (see the [GitHub documentation]). there's no
need for the duplicate check implemented in the workflow anymore.

other projects which are created based on the template which want a DCO
check can also just enable this in their settings.

fixes opensearch-project#61

[GitHub documentation]: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository

Signed-off-by: Ralph Ursprung <[email protected]>
@rursprung rursprung force-pushed the remove-manual-dco-check branch from 107d1b8 to 915063d Compare June 20, 2024 15:30
@rursprung
Copy link
Contributor Author

note that an admin will have to manually remove the DCO workflow from the list of required GitHub workflows for PRs in the repo settings.

@reta reta added the backport 2.x Backport to 2.x branch label Jun 20, 2024
@rursprung
Copy link
Contributor Author

the backport workflow failure seems to be a false-reject:

Error: Error: For security reasons, this action should only run on merged PRs.

i guess either the workflow is mis-configured or otherwise has a bug since it shouldn't even be running at this moment?

@reta reta removed the backport 2.x Backport to 2.x branch label Jun 20, 2024
@reta
Copy link
Collaborator

reta commented Jun 20, 2024

i guess either the workflow is mis-configured or otherwise has a bug since it shouldn't even be running at this moment?

Yeah, there are diffs sadly in the way it works on different repos

@reta reta added the bug Something isn't working label Jun 20, 2024
@reta reta merged commit 13c1d10 into opensearch-project:main Jun 20, 2024
9 of 10 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Jun 20, 2024
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-plugin-template-java/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-plugin-template-java/backport-2.x
# Create a new branch
git switch --create backport/backport-92-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 13c1d10fecac2e07a19618acd0342386d82833f0
# Push it to GitHub
git push --set-upstream origin backport/backport-92-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-plugin-template-java/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-92-to-2.x.

@rursprung rursprung deleted the remove-manual-dco-check branch June 20, 2024 15:54
@reta
Copy link
Collaborator

reta commented Jun 20, 2024

@rursprung could you please send manual backport to 2.x if needed? thank you

@rursprung
Copy link
Contributor Author

@rursprung could you please send manual backport to 2.x if needed? thank you

done (#93)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[PROPOSAL] Delete the manual DCO check
2 participants