Skip to content

Conversation

@jonathan-gramain
Copy link
Contributor

@jonathan-gramain jonathan-gramain commented May 29, 2025

Also added a missing direct dependency on "mongodb" (see commit message for details)

@bert-e
Copy link
Contributor

bert-e commented May 29, 2025

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 May 29, 2025

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

@jonathan-gramain
Copy link
Contributor Author

/create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 29, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/1.15/bugfix/S3UTILS-193-bump-bucketclient with contents from bugfix/S3UTILS-193-bump-bucketclient
and development/1.15.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.15/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.15
 $ git merge origin/bugfix/S3UTILS-193-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.15/bugfix/S3UTILS-193-bump-bucketclient

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 29, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/1.16/bugfix/S3UTILS-193-bump-bucketclient with contents from w/1.15/bugfix/S3UTILS-193-bump-bucketclient
and development/1.16.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.16/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.16
 $ git merge origin/w/1.15/bugfix/S3UTILS-193-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.16/bugfix/S3UTILS-193-bump-bucketclient

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented May 29, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3UTILS-193-bump-bucketclient branch from c5c63a2 to 2057794 Compare August 27, 2025 23:17
@bert-e
Copy link
Contributor

bert-e commented Aug 27, 2025

History mismatch

Merge commit #8e2b3338642b3a1772940e14eade006dc5cf39e8 on the integration branch
w/1.15/bugfix/S3UTILS-193-bump-bucketclient is merging a branch which is neither the current
branch bugfix/S3UTILS-193-bump-bucketclient nor the development branch
development/1.15.

It is likely due to a rebase of the branch bugfix/S3UTILS-193-bump-bucketclient and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3UTILS-193-bump-bucketclient branch from 2057794 to 34a5830 Compare August 28, 2025 00:28
@jonathan-gramain jonathan-gramain changed the base branch from development/1.14 to development/1.15 August 28, 2025 00:29
@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Incorrect fix version

The Fix Version/s in issue S3UTILS-193 contains:

  • 1.14.21

  • 1.15.12

  • 1.16.1

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

  • 1.15.12

  • 1.16.1

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

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

History mismatch

Merge commit #8e2b3338642b3a1772940e14eade006dc5cf39e8 on the integration branch
w/1.16/bugfix/S3UTILS-193-bump-bucketclient is merging a branch which is neither the current
branch bugfix/S3UTILS-193-bump-bucketclient nor the development branch
development/1.16.

It is likely due to a rebase of the branch bugfix/S3UTILS-193-bump-bucketclient and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

The "mongodb" module is imported directly by some tests, so it has to
be declared in package.json with a compatible version. I used the same
version than in the current direct dependency of arsenal.

Not having this direct dependency caused test failures due to an older
mongodb 3 version being hoisted instead for arcane reasons (from
another indirect dependency). This caused BSON version incompatibility
errors.

issue: S3UTILS-193
@jonathan-gramain jonathan-gramain force-pushed the bugfix/S3UTILS-193-bump-bucketclient branch from 34a5830 to b343c56 Compare August 28, 2025 20:59
@jonathan-gramain jonathan-gramain changed the base branch from development/1.15 to development/1.14 August 28, 2025 20:59
@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Incorrect fix version

The Fix Version/s in issue S3UTILS-193 contains:

  • 1.15.12

  • 1.16.1

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

  • 1.14.21

  • 1.15.12

  • 1.16.1

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

The following options are set: create_integration_branches

@jonathan-gramain
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/1.15/bugfix/S3UTILS-193-bump-bucketclient with contents from bugfix/S3UTILS-193-bump-bucketclient
and development/1.15.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.15/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.15
 $ git merge origin/bugfix/S3UTILS-193-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.15/bugfix/S3UTILS-193-bump-bucketclient

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Conflict

A conflict has been raised during the creation of
integration branch w/1.16/bugfix/S3UTILS-193-bump-bucketclient with contents from w/1.15/bugfix/S3UTILS-193-bump-bucketclient
and development/1.16.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/1.16/bugfix/S3UTILS-193-bump-bucketclient origin/development/1.16
 $ git merge origin/w/1.15/bugfix/S3UTILS-193-bump-bucketclient
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/1.16/bugfix/S3UTILS-193-bump-bucketclient

The following options are set: create_integration_branches

@bert-e
Copy link
Contributor

bert-e commented Aug 28, 2025

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

The following options are set: create_integration_branches

@jonathan-gramain
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 29, 2025

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

  • ✔️ development/1.14

  • ✔️ development/1.15

  • ✔️ development/1.16

The following branches have NOT changed:

  • development/1.13
  • development/1.4

Please check the status of the associated issue S3UTILS-193.

Goodbye jonathan-gramain.

The following options are set: approve, create_integration_branches

@bert-e bert-e merged commit b343c56 into development/1.14 Aug 29, 2025
4 checks passed
@bert-e bert-e deleted the bugfix/S3UTILS-193-bump-bucketclient branch August 29, 2025 17:20
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.

6 participants