Skip to content

fix(frontend): remove workorder provider references from configuration#6599

Merged
zijiren233 merged 1 commit intolabring:mainfrom
cuisongliu:delete-worker
Jan 27, 2026
Merged

fix(frontend): remove workorder provider references from configuration#6599
zijiren233 merged 1 commit intolabring:mainfrom
cuisongliu:delete-worker

Conversation

@cuisongliu
Copy link
Collaborator

No description provided.

Signed-off-by: cuisongliu <cuisongliu@qq.com>
@pull-request-size
Copy link

Whoa! Easy there, Partner!

This PR is too big. Please break it up into smaller PRs.

@zijiren233 zijiren233 merged commit ddf45a9 into labring:main Jan 27, 2026
79 of 84 checks passed
@cuisongliu cuisongliu deleted the delete-worker branch January 27, 2026 06:25
@github-actions
Copy link
Contributor

🤖 says: Error cherry-picking.

Auto-merging frontend/package.json
Auto-merging frontend/pnpm-lock.yaml
CONFLICT (content): Merge conflict in frontend/pnpm-lock.yaml
CONFLICT (modify/delete): frontend/providers/workorder/next.config.js deleted in ddf45a9 (fix(frontend): remove workorder provider references from configuration (#6599)) and modified in HEAD. Version HEAD of frontend/providers/workorder/next.config.js left in tree.
CONFLICT (modify/delete): frontend/providers/workorder/package.json deleted in ddf45a9 (fix(frontend): remove workorder provider references from configuration (#6599)) and modified in HEAD. Version HEAD of frontend/providers/workorder/package.json left in tree.
CONFLICT (modify/delete): frontend/providers/workorder/src/utils/tools.ts deleted in ddf45a9 (fix(frontend): remove workorder provider references from configuration (#6599)) and modified in HEAD. Version HEAD of frontend/providers/workorder/src/utils/tools.ts left in tree.
error: could not apply ddf45a9... fix(frontend): remove workorder provider references from configuration (#6599)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@github-actions
Copy link
Contributor

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/21386978321

zjy365 pushed a commit to zjy365/sealos that referenced this pull request Jan 27, 2026
cuisongliu added a commit that referenced this pull request Jan 27, 2026
#6614)

* fix(frontend): remove workorder provider references from configuration (#6599)

Signed-off-by: cuisongliu <cuisongliu@qq.com>

* update

---------

Signed-off-by: cuisongliu <cuisongliu@qq.com>
Co-authored-by: cuisongliu <cuisongliu@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants