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

chore: merge master into feature #33904

Merged
merged 4 commits into from Jan 30, 2022
Merged

chore: merge master into feature #33904

merged 4 commits into from Jan 30, 2022

Conversation

MadCcc
Copy link
Member

@MadCcc MadCcc commented Jan 30, 2022

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English
🇨🇳 Chinese

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@github-actions
Copy link
Contributor

github-actions bot commented Jan 30, 2022

@github-actions
Copy link
Contributor

Size Change: 0 B

Total Size: 935 kB

ℹ️ View Unchanged
Filename Size
./dist/antd-with-locales.min.js 361 kB
./dist/antd.compact.min.css 65.6 kB
./dist/antd.dark.min.css 66.9 kB
./dist/antd.min.css 65.6 kB
./dist/antd.min.js 309 kB
./dist/antd.variable.min.css 66.2 kB

compressed-size-action

@codecov
Copy link

codecov bot commented Jan 30, 2022

Codecov Report

Merging #33904 (222ee1f) into feature (da70abe) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##           feature    #33904   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          421       421           
  Lines         7809      7822   +13     
  Branches      2296      2301    +5     
=========================================
+ Hits          7809      7822   +13     
Impacted Files Coverage Δ
components/layout/Sider.tsx 100.00% <ø> (ø)
components/button/button.tsx 100.00% <100.00%> (ø)
components/grid/row.tsx 100.00% <100.00%> (ø)
components/notification/index.tsx 100.00% <100.00%> (ø)
components/tooltip/index.tsx 100.00% <100.00%> (ø)
components/typography/Base/index.tsx 100.00% <100.00%> (ø)
components/upload/Upload.tsx 100.00% <100.00%> (ø)
components/upload/UploadList/index.tsx 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0d4e1b1...222ee1f. Read the comment docs.

@MadCcc
Copy link
Member Author

MadCcc commented Jan 30, 2022

手滑把 feature merge 到 master 上了,已经 revert 回去了。
但是 master 到 feature 无法自动合并,需要 revert revert 一下。。💔

@afc163
Copy link
Member

afc163 commented Jan 30, 2022

自动合并机器人貌似是定时的,可以等一会。

@MadCcc
Copy link
Member Author

MadCcc commented Jan 30, 2022

自动合并机器人貌似是定时的,可以等一会。

机器人似乎不理这个,不是直接从 master merge 的

@afc163 afc163 merged commit e81214a into feature Jan 30, 2022
@afc163 afc163 deleted the chore/sync-master branch January 30, 2022 10:31
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.

None yet

2 participants