ci: fix

ng-alain · Mar 15, 2024 · 5616ff6 · 5616ff6
1 parent 138d77e
commit 5616ff6
Show file tree

Hide file tree

Showing 41 changed files with 17 additions and 47 deletions.
diff --git a/packages/abc/avatar-list/style/index.less b/packages/abc/avatar-list/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @avatar-list-prefix: ~'.avatar-list';
 
 @{avatar-list-prefix} {

diff --git a/packages/abc/cell/style/index.less b/packages/abc/cell/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @cell-prefix: ~'.cell';
 
 @{cell-prefix} {

diff --git a/packages/abc/down-file/style/index.less b/packages/abc/down-file/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @down-file-prefix: ~'.down-file';
 
 @{down-file-prefix} {

diff --git a/packages/abc/ellipsis/style/index.less b/packages/abc/ellipsis/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @ellipsis-prefix: ~'.ellipsis';
 
 ellipsis {

diff --git a/packages/abc/error-collect/style/index.less b/packages/abc/error-collect/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @error-collect-prefix: ~'.error-collect';
 
 @{error-collect-prefix} {

diff --git a/packages/abc/exception/style/index.less b/packages/abc/exception/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @exception-prefix: ~'.exception';
 
 @{exception-prefix} {

diff --git a/packages/abc/footer-toolbar/style/index.less b/packages/abc/footer-toolbar/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @footer-toolbar-prefix: ~'.footer-toolbar';
 
 @{footer-toolbar-prefix} {

diff --git a/packages/abc/full-content/style/index.less b/packages/abc/full-content/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @full-content-prefix: ~'.full-content';
 
 @{full-content-prefix} {

diff --git a/packages/abc/global-footer/style/index.less b/packages/abc/global-footer/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @global-footer-prefix: ~'.global-footer';
 
 @{global-footer-prefix} {

diff --git a/packages/abc/loading/style/index.less b/packages/abc/loading/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @loading-prefix: ~'.loading';
 
 @{loading-prefix} {

diff --git a/packages/abc/notice-icon/style/index.less b/packages/abc/notice-icon/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @notice-icon-prefix: ~'.notice-icon';
 
 @{notice-icon-prefix} {

diff --git a/packages/abc/onboarding/style/index.less b/packages/abc/onboarding/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @onboarding-prefix: ~'.onboarding';
 
 @{onboarding-prefix} {

diff --git a/packages/abc/page-header/style/index.less b/packages/abc/page-header/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @page-header-prefix: ~'.page-header';
 
 @{page-header-prefix} {

diff --git a/packages/abc/pdf/style/index.less b/packages/abc/pdf/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @pdf-prefix: ~'.pdf';
 
 @{pdf-prefix} {

diff --git a/packages/abc/quick-menu/style/index.less b/packages/abc/quick-menu/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @quick-menu-prefix: ~'.quick-menu';
 
 @{quick-menu-prefix} {

diff --git a/packages/abc/result/style/index.less b/packages/abc/result/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @result-prefix: ~'.result';
 
 @{result-prefix} {

diff --git a/packages/abc/reuse-tab/style/index.less b/packages/abc/reuse-tab/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @reuse-tab-prefix: ~'.reuse-tab';
 
 @{reuse-tab-prefix} {

diff --git a/packages/abc/se/style/index.less b/packages/abc/se/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @se-prefix: ~'.se';
 
 @{se-prefix} {

diff --git a/packages/abc/st/style/index.less b/packages/abc/st/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @st-prefix: ~'.st';
 
 @{st-prefix} {

diff --git a/packages/abc/sv/style/index.less b/packages/abc/sv/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @sv-prefix: ~'.sv';
 
 @{sv-prefix} {
@@ -11,7 +10,7 @@
   &__container {
     display: block;
 
-    // offset the padding-bottom of last row
+    /** offset the padding-bottom of last row */
     .@{ant-prefix}-row {
       overflow: hidden;
       margin-bottom: -@sv-bottom;
@@ -125,7 +124,7 @@
   }
 
   &__small {
-    // offset the padding-bottom of last row
+    /** offset the padding-bottom of last row */
     .@{ant-prefix}-row {
       margin-bottom: -8px;
     }
@@ -157,7 +156,6 @@
     }
 
     &-text {
-      // font-weight: 700;font-weight
       font-size: @sv-value-default-value-font-size;
     }
 

diff --git a/packages/abc/tag-select/style/index.less b/packages/abc/tag-select/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @tag-select-prefix: ~'.tag-select';
 @tag-select-height: @tag-line-height + 2px; // 2px is top & bottom border width
 

diff --git a/packages/chart/card/style/index.less b/packages/chart/card/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @g2-card-prefix: ~'.g2-card';
 
 @{g2-card-prefix} {

diff --git a/packages/chart/mini-progress/style/index.less b/packages/chart/mini-progress/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @g2-mini-progress-prefix: ~'.g2-mini-progress';
 
 @{g2-mini-progress-prefix} {

diff --git a/packages/chart/number-info/style/index.less b/packages/chart/number-info/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @number-info-prefix: ~'.number-info';
 
 @{number-info-prefix} {

diff --git a/packages/chart/pie/style/index.less b/packages/chart/pie/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @g2-pie-prefix: ~'.g2-pie';
 
 @{g2-pie-prefix} {

diff --git a/packages/chart/radar/style/index.less b/packages/chart/radar/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @g2-radar-prefix: ~'.g2-radar';
 
 @{g2-radar-prefix} {

diff --git a/packages/chart/trend/style/index.less b/packages/chart/trend/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @trend-prefix: ~'.trend';
 
 @{trend-prefix} {

diff --git a/packages/chart/water-wave/style/index.less b/packages/chart/water-wave/style/index.less
@@ -1,4 +1,3 @@
-@import '../../../theme/index.less';
 @g2-water-wave-prefix: ~'.g2-water-wave';
 
 @{g2-water-wave-prefix} {

diff --git a/packages/theme/index.less b/packages/theme/index.less
@@ -1,2 +1 @@
-// @import './theme-default.less';
-@import './theme-@{root-entry-name}.less';
+@import './theme-default.less';
diff --git a/packages/theme/layout-blank/style/index.less b/packages/theme/layout-blank/style/index.less
@@ -1,3 +1,2 @@
-@import './theme-@{root-entry-name}.less';
 @import './_layout.less';
 @import './fix/index.less';
diff --git a/packages/theme/layout-default/style/index.less b/packages/theme/layout-default/style/index.less
@@ -1,4 +1,3 @@
-@import './theme-@{root-entry-name}.less';
 // Layout
 @import './_layout.less';
 @import './_header.less';

diff --git a/packages/theme/mixins.less b/packages/theme/mixins.less
@@ -0,0 +1,2 @@
+@import 'ng-zorro-antd/src/style/mixins/index.less';
+@import './system/mixins/index.less';
diff --git a/packages/theme/system/index.less b/packages/theme/system/index.less
@@ -5,4 +5,5 @@
 @import 'ng-zorro-antd/components.less';
 
 /** system */
+@import './mixins/index.less';
 @import './entry.less';
diff --git a/packages/theme/system/theme-default.less b/packages/theme/system/theme-default.less
@@ -1,5 +1,4 @@
-@import 'ng-zorro-antd/src/style/mixins/index.less';
-@import './mixins/index.less';
+@root-entry-name: default;
 
 // grey
 @grey-1:  #ffffff;

diff --git a/packages/theme/system/theme-variable.less b/packages/theme/system/theme-variable.less
@@ -1,5 +1,7 @@
 @import './theme-default.less';
 
+@root-entry-name: variable;
+
 @{html-selector} {
   --grey-1:  #fff;
   --grey-2:  #fafafa;

diff --git a/packages/theme/theme-compact.less b/packages/theme/theme-compact.less
@@ -1,5 +1,4 @@
-@root-entry-name: compact;
-
+@import './mixins.less';
 @import 'ng-zorro-antd/src/style/themes/compact.less';
 @import './system/theme-compact.less';
 @import './layout-default/style/theme-compact.less';

diff --git a/packages/theme/theme-dark.less b/packages/theme/theme-dark.less
@@ -1,5 +1,4 @@
-@root-entry-name: dark;
-
+@import './mixins.less';
 @import 'ng-zorro-antd/src/style/themes/dark.less';
 @import './system/theme-dark.less';
 @import './layout-default/style/theme-dark.less';

diff --git a/packages/theme/theme-default.less b/packages/theme/theme-default.less
@@ -1,5 +1,4 @@
-@root-entry-name: default;
-
+@import './mixins.less';
 @import 'ng-zorro-antd/src/style/themes/default.less';
 @import './system/theme-default.less';
 @import './layout-default/style/theme-default.less';

diff --git a/packages/theme/theme-variable.less b/packages/theme/theme-variable.less
@@ -1,5 +1,4 @@
-@root-entry-name: variable;
-
+@import './mixins.less';
 @import 'ng-zorro-antd/src/style/themes/variable.less';
 @import './system/theme-variable.less';
 @import './layout-default/style/theme-variable.less';

diff --git a/scripts/build/copy-less.js b/scripts/build/copy-less.js
@@ -27,6 +27,7 @@ function copyLess(name) {
 function copyTheme() {
   [
     'system',
+    'mixins.less',
     'index.less',
     'default.less',
     'dark.less',

diff --git a/scripts/ci/build-artifacts.sh b/scripts/ci/build-artifacts.sh
@@ -92,16 +92,17 @@ echo "https://${ACCESS_TOKEN}:@github.com" > .git/credentials
 
 if [[ $(git ls-remote origin "refs/tags/${buildTagName}") ]]; then
   echo "removed tag because tag is already published"
-  # git push origin :refs/tags/${buildTagName}
   git push --delete origin ${buildTagName}
+  git push origin :refs/tags/${buildTagName}
+  sleep 5
 fi
 
 echo "Git configuration has been updated to match the last commit author. Publishing now.."
 
 git add -A
 git commit --allow-empty -m "${buildCommitMessage}"
 git tag "${buildTagName}"
-git push origin ${branchName} --tags
+git push origin ${branchName} --tags -f
 
 echo "Published package artifacts for ${packageName}#${buildVersionName} into ${branchName}"