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

CLDSRV-547 [fixup] bump version to 7.70.49 #5607

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

jonathan-gramain
Copy link
Contributor

Fixup the version, as 7.70.48 was already tagged

Fixup the version, as 7.70.48 was already tagged
@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

Hello jonathan-gramain,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options
name description privileged authored
/after_pull_request Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval Bypass the pull request author's approval
/bypass_build_status Bypass the build and test status
/bypass_commit_size Bypass the check on the size of the changeset TBA
/bypass_incompatible_branch Bypass the check on the source branch prefix
/bypass_jira_check Bypass the Jira issue check
/bypass_peer_approval Bypass the pull request peers' approval
/bypass_leader_approval Bypass the pull request leaders' approval
/approve Instruct Bert-E that the author has approved the pull request. ✍️
/create_pull_requests Allow the creation of integration pull requests.
/create_integration_branches Allow the creation of integration branches.
/no_octopus Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity Change review acceptance criteria from one reviewer at least to all reviewers
/wait Instruct Bert-E not to run until further notice.
Available commands
name description privileged
/help Print Bert-E's manual in the pull request.
/status Print Bert-E's current status in the pull request TBA
/clear Remove all comments from Bert-E from the history TBA
/retry Re-start a fresh build TBA
/build Re-start a fresh build TBA
/force_reset Delete integration branches & pull requests, and restart merge process from the beginning.
/reset Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-547 contains:

  • 7.10.48

  • 7.70.45.1

  • 7.70.49

  • 8.6.27

  • 8.7.48

  • 8.8.27

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.70.49

  • 8.6.27

  • 8.7.48

  • 8.8.27

Please check the Fix Version/s of CLDSRV-547, or the target
branch of this pull request.

@jonathan-gramain
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

Incorrect fix version

The Fix Version/s in issue CLDSRV-547 contains:

  • 7.10.48

  • 7.70.45.1

  • 7.70.49

  • 8.6.27

  • 8.7.48

  • 8.8.27

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.70.49

  • 8.6.27

  • 8.7.48

  • 8.8.27

Please check the Fix Version/s of CLDSRV-547, or the target
branch of this pull request.

The following options are set: create_integration_branches

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

Conflict

A conflict has been raised during the creation of
integration branch w/8.6/bugfix/CLDSRV-547-fixup-version with contents from bugfix/CLDSRV-547-fixup-version
and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/CLDSRV-547-fixup-version origin/development/8.6
 $ git merge origin/bugfix/CLDSRV-547-fixup-version
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/CLDSRV-547-fixup-version

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve, create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Jun 27, 2024

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.70

  • ✔️ development/8.6

  • ✔️ development/8.7

  • ✔️ development/8.8

The following branches have NOT changed:

  • development/7.10
  • development/7.4

Please check the status of the associated issue CLDSRV-547.

Goodbye jonathan-gramain.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit c0fe0cf into development/7.70 Jun 27, 2024
11 checks passed
@bert-e bert-e deleted the bugfix/CLDSRV-547-fixup-version branch June 27, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants