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

fix: prevent initialization failure when theme directory already exists #6889

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

guqing
Copy link
Member

@guqing guqing commented Oct 17, 2024

What type of PR is this?

/kind bug
/area core
/milestone 2.20.x

What this PR does / why we need it:

修复从旧版本升级到 2.20 会因为默认主题目录已经存在而无法初始化的问题

Which issue(s) this PR fixes:

Fixes #6887

Does this PR introduce a user-facing change?

修复从旧版本升级到 2.20 会因为默认主题目录已经存在而无法初始化的问题

@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/bug Categorizes issue or PR as related to a bug. labels Oct 17, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.20.x milestone Oct 17, 2024
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Oct 17, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from JohnNiang and wan92hen October 17, 2024 08:32
Copy link

Copy link

codecov bot commented Oct 17, 2024

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 57.16%. Comparing base (eff73dc) to head (86e7bf2).
Report is 16 commits behind head on main.

Files with missing lines Patch % Lines
...a/run/halo/app/theme/service/ThemeServiceImpl.java 0.00% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6889      +/-   ##
============================================
+ Coverage     56.99%   57.16%   +0.17%     
- Complexity     3999     4004       +5     
============================================
  Files           714      712       -2     
  Lines         24110    24130      +20     
  Branches       1585     1592       +7     
============================================
+ Hits          13742    13795      +53     
+ Misses         9756     9720      -36     
- Partials        612      615       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@ruibaby ruibaby 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 Oct 17, 2024
Copy link

f2c-ci-robot bot commented Oct 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ruibaby

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 Oct 17, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit c465bf8 into halo-dev:main Oct 17, 2024
8 checks passed
@guqing guqing deleted the fix/preset-theme-exist branch October 17, 2024 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/bug Categorizes issue or PR as related to a bug. 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.

从旧版本升级到 2.20,无法初始化
2 participants