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.

Sign up for GitHub

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

Jump to bottom

Maintain production and numbered branches post release v4.5.0 #731

Closed
7 tasks done
jnasselle opened this issue Aug 10, 2023 · 0 comments · Fixed by #733, #734 or #732
Closed
7 tasks done

Maintain production and numbered branches post release v4.5.0 #731

jnasselle opened this issue Aug 10, 2023 · 0 comments · Fixed by #733, #734 or #732
Assignees
@davidcr01
Labels
level/subtask Subtask issue type/maintenance Maintenance issue

Comments

@jnasselle
Copy link
Member

jnasselle commented Aug 10, 2023 •
edited by davidcr01
Loading

The goal is to complete the following tasks, each task must have a PR associated with this issue.

The branches must follow the naming: merge-<ORIGIN_BRANCH>-into-<DESTINATION_BRANCH>. For example, merge-4.5.0-into-4.5.

Also, all PRs corresponding to the same phase (merge-X-into-Y) must be merged at the same time.

Wazuh-documentation -> @wazuh/cicd

  • Merge tag v4.5.0 into 4.5 (fast-forward) on wazuh-puppet repository
  • Delete branch 4.5.0
  • Merge branch 4.5 into 4.5.1 on wazuh-puppet repository (Up-to-date)
  • Merge branch 4.5.1 into 4.5.2 on wazuh-puppet repository (Up-to-date)
  • Merge branch 4.5.2 into 4.6.0 on wazuh-puppet repository - Merge 4.5.2 into 4.6.0 #732
  • Merge branch 4.6.0 into 4.7.0 on wazuh-puppet repository - Merge 4.6.0 into 4.7.0 #733
  • Merge branch 4.7.0 into master on wazuh-puppet repository - Merge 4.7.0 into master #734

Parent issue: wazuh/wazuh#18336.
@jnasselle jnasselle mentioned this issue Aug 10, 2023
Closed
84 tasks
@fcaffieri fcaffieri added type/maintenance Maintenance issue level/subtask Subtask issue labels Aug 10, 2023
@davidcr01 davidcr01 self-assigned this Aug 11, 2023
This was referenced Aug 11, 2023
Merged
Merged
@teddytpc1 teddytpc1 linked a pull request Aug 11, 2023 that will close this issue
Merge 4.6.0 into 4.7.0 #733
Merged
@davidcr01 davidcr01 mentioned this issue Aug 11, 2023
Merged
This was linked to pull requests Aug 11, 2023
Merge 4.7.0 into master #734
Merged
Merge 4.5.2 into 4.6.0 #732
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@davidcr01 davidcr01

Labels
level/subtask Subtask issue type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
3 participants
@jnasselle @davidcr01 @fcaffieri