Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

chore: bump editor version to 3.0.5 #584

Merged
merged 1 commit into from
Jul 6, 2022

Conversation

ruibaby
Copy link
Member

@ruibaby ruibaby commented Jul 6, 2022

Signed-off-by: Ryan Wang [email protected]

What type of PR is this?

/kind improvement

What this PR does / why we need it:

升级 @halo-dev/editor 的版本。

Which issue(s) this PR fixes:

Fixes #

Screenshots:

None

Special notes for your reviewer:

/cc @halo-dev/sig-halo-admin

Does this PR introduce a user-facing change?

升级 `@halo-dev/editor` 的版本至 3.0.5。

@auto-assign auto-assign bot requested review from guqing, JohnNiang and LIlGG July 6, 2022 11:54
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/improvement Categorizes issue or PR as related to a improvement. labels Jul 6, 2022
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jul 6, 2022
@JohnNiang
Copy link
Member

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Jul 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit 02cbf39 into halo-dev:master Jul 6, 2022
@ruibaby ruibaby deleted the chore/bump-editor-version branch July 6, 2022 13:22
@ruibaby
Copy link
Member Author

ruibaby commented Jul 6, 2022

/cherrypick release-1.5

@halo-dev-bot
Copy link

@ruibaby: #584 failed to apply on top of branch "release-1.5":

Applying: chore: bump editor version to 3.0.5
Using index info to reconstruct a base tree...
M	package.json
M	pnpm-lock.yaml
Falling back to patching base and 3-way merge...
Auto-merging pnpm-lock.yaml
CONFLICT (content): Merge conflict in pnpm-lock.yaml
Auto-merging package.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: bump editor version to 3.0.5
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@caglam1356
Copy link

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants