[
https://issues.apache.org/jira/browse/HDDS-15922?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sarveksha Yeshavantha Raju updated HDDS-15922:
----------------------------------------------
Description:
The {{update-ozone-site-config-doc}} workflow in the ozone repo checks out the
{{automated-config-doc-update}} branch in ozone-site when it still exists after
a PR is merged. New commits are added on top of that stale branch, so
already-merged changes show up again in the next PR.
Workaround: Delete {{automated-config-doc-update}} in ozone-site after each
merge.
Fix: Always use {{master}} as the baseline - compare doc changes against
master, recreate the PR branch from master. Branch deletion after merge should
no longer be required.
Example:
[https://github.com/apache/ozone-site/pull/487] merged commits
[68268fa|https://github.com/apache/ozone-site/pull/487/commits/68268fa817be5d3550f22c8dfcc70c7dbcb5d612]
and
[a8e25a6|https://github.com/apache/ozone-site/pull/487/commits/a8e25a6ab70447c7399210f2aa3b6b2bf3fff464]
but branch not deleted.
[https://github.com/apache/ozone-site/pull/493] same commits have reappeared
here.
was:
The {{update-ozone-site-config-doc}} workflow in the ozone repo checks out the
{{automated-config-doc-update}} branch in ozone-site when it still exists after
a PR is merged. New commits are added on top of that stale branch, so
already-merged changes show up again in the next PR.
Workaround: Delete {{automated-config-doc-update}} in ozone-site after each
merge.
Fix: Always use {{master}} as the baseline - compare doc changes against
master, recreate the PR branch from master. Branch deletion after merge should
no longer be required.
> Fix ozone-site config doc workflow reusing stale PR branch
> ----------------------------------------------------------
>
> Key: HDDS-15922
> URL: https://issues.apache.org/jira/browse/HDDS-15922
> Project: Apache Ozone
> Issue Type: Improvement
> Components: CI, documentation
> Reporter: Sarveksha Yeshavantha Raju
> Assignee: Sravani Revuri
> Priority: Minor
>
> The {{update-ozone-site-config-doc}} workflow in the ozone repo checks out
> the {{automated-config-doc-update}} branch in ozone-site when it still exists
> after a PR is merged. New commits are added on top of that stale branch, so
> already-merged changes show up again in the next PR.
> Workaround: Delete {{automated-config-doc-update}} in ozone-site after each
> merge.
> Fix: Always use {{master}} as the baseline - compare doc changes against
> master, recreate the PR branch from master. Branch deletion after merge
> should no longer be required.
>
> Example:
> [https://github.com/apache/ozone-site/pull/487] merged commits
> [68268fa|https://github.com/apache/ozone-site/pull/487/commits/68268fa817be5d3550f22c8dfcc70c7dbcb5d612]
> and
> [a8e25a6|https://github.com/apache/ozone-site/pull/487/commits/a8e25a6ab70447c7399210f2aa3b6b2bf3fff464]
> but branch not deleted.
> [https://github.com/apache/ozone-site/pull/493] same commits have reappeared
> here.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
