From 739405124a338980c83a3043f2c9ceeb9e7eee2c Mon Sep 17 00:00:00 2001
From: Xuan Hu <i@huxuan.org>
Date: Tue, 5 Sep 2023 08:43:55 +0000
Subject: [PATCH] chore: Fix package ci with shorter badge names.

---
 .github/workflows/package.yml                                  | 3 ++-
 .github/workflows/pages.yml                                    | 2 +-
 .gitlab-ci.yml                                                 | 2 +-
 .../workflows/package.yml.jinja                                | 3 ++-
 .../workflows/pages.yml.jinja                                  | 2 +-
 ... == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 0486f82b..731b1d1a 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -14,8 +14,9 @@ jobs:
       - env:
           TWINE_NON_INTERACTIVE: true
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+          TWINE_USERNAME: ${{ vars.TWINE_USERNAME }}
         run: make upload
-name: Deploy Python Package
+name: Package
 on:
   release:
     types:
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index c435a2aa..cebad036 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -25,7 +25,7 @@ jobs:
       - id: deployment
         name: Deploy to GitHub Pages
         uses: actions/deploy-pages@v2
-name: Deploy GitHub Pages
+name: Pages
 on:
   release:
     types:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46cfdd58..65d3b64b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ package:
     - make upload
   stage: build_release
   variables:
-    TWINE_NON_INTERACTIVE: true
+    TWINE_NON_INTERACTIVE: 'true'
 pages:
   artifacts:
     paths:
diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/package.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/package.yml.jinja
index 29163d2d..e67b7c72 100644
--- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/package.yml.jinja	
+++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/package.yml.jinja	
@@ -14,8 +14,9 @@ jobs:
       - env:
           TWINE_NON_INTERACTIVE: true
           TWINE_PASSWORD: {{ '${{ secrets.TWINE_PASSWORD }}' }}
+          TWINE_USERNAME: {{ '${{ vars.TWINE_USERNAME }}' }}
         run: make upload
-name: Deploy Python Package
+name: Package
 on:
   release:
     types:
diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/pages.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/pages.yml.jinja
index e160502e..ff6dd273 100644
--- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/pages.yml.jinja	
+++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/pages.yml.jinja	
@@ -25,7 +25,7 @@ jobs:
       - id: deployment
         name: Deploy to GitHub Pages
         uses: actions/deploy-pages@v2
-name: Deploy GitHub Pages
+name: Pages
 on:
   release:
     types:
diff --git a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja
index 607d79ec..2c3bf836 100644
--- a/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja	
+++ b/template/[% if repo_host_type == 'gitlab.com' or repo_host_type == 'gitlab-self-managed' %].gitlab-ci.yml[% endif %].jinja	
@@ -86,7 +86,7 @@ package:
     - make upload
   stage: build_release
   variables:
-    TWINE_NON_INTERACTIVE: true
+    TWINE_NON_INTERACTIVE: 'true'
 pages:
   artifacts:
     paths: