新的程序包会将会使用更详细的名称

Author: SHIINASAMA

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - uses: yezz123/setup-uv@v4
 
       - name: Before script (Linux)
@@ -81,28 +81,35 @@ jobs:
           brew install create-dmg
           xattr -cr build/${{ env.APP_NAME }}.app
           ./build-dmg.sh
-          zip -r ${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}.zip build/${{ env.APP_NAME }}.app/
+          mkdir -p release
+          zip -r \
+            release/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip \
+            build/${{ env.APP_NAME }}.app/
 
       - name: Package artifact (Linux)
         if: runner.os == 'Linux'
         run: |
-          # mv ./build/App ./Package
-          zip -r ${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}.zip ${{ env.APP_NAME }}/
+          mv ./build/${{ env.APP_NAME }} ./build/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}
+          mkdir -p release
+          zip -r \
+            release/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip \
+            build/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}/
 
       - name: Package artifact (Windows)
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          # Move-Item -Path ./build/App -Destination ./Package
-          Compress-Archive -Path .\${{ env.APP_NAME }}\ -DestinationPath ${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}.zip
+          Move-Item -Path ./build/${{ env.APP_NAME }}.exe -Destination ./build/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}
+          New-Item -ItemType Directory -Path release
+          Compress-Archive -Path ./build/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }} `
+            -DestinationPath ./release/${{ env.APP_NAME }}-${{ matrix.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: App-${{ matrix.name }}-${{ matrix.arch }}
           path: |
-            ./${{ env.APP_NAME }}-*
-            ./*.dmg
+            ./release/*
 
   build_whl:
     runs-on: ubuntu-latest
@@ -114,7 +121,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: "3.11"
       - uses: yezz123/setup-uv@v4
 
       - name: Setup, install dependencies, build

.gitlab-ci.yml

@@ -31,7 +31,6 @@ check_version:
   rules:
     - changes:
         - app/**
-        - tool/**
   script:
     - pip install uv
     - uv sync
@@ -47,13 +46,12 @@ check_version:
     - pip install uv
     - uv sync
     - uv run pyside-cli build --onedir
-    - mv ./build/${APP_NAME} ./Package
   rules:
     - if: $CI_COMMIT_TAG
   artifacts:
     name: "build-${CI_COMMIT_SHA}"
     paths:
-      - ./release/${APP_NAME}-*
+      - ./release/*
     expire_in: 3 days
 
 test_windows_x64:
@@ -84,16 +82,31 @@ build_whl:
   artifacts:
     name: "build-${CI_COMMIT_SHA}"
     paths:
-      - ./release/*.whl
+      - ./release/*
     expire_in: 3 days
 
 build_windows_x64:
   extends: .build
   tags:
     - windows
   after_script:
+    - Move-Item -Path ./build/${APP_NAME} -Destination ./build/${APP_NAME}-windows-x64-${CI_COMMIT_TAG}
     - New-Item -Path release -Type Directory
-    - Compress-Archive -Path .\Package\ -DestinationPath .\release\${APP_NAME}-windows-x64.zip -CompressionLevel Optimal
+    - Compress-Archive -Path ./build/${APP_NAME}-windows-x64-${CI_COMMIT_TAG}/ `
+      -DestinationPath ./release/${APP_NAME}-windows-x64-${CI_COMMIT_TAG}.zip `
+      -CompressionLevel Optimal
+
+build_linux_x64:
+  extends: .build
+  image: reg.mikumikumi.xyz/mirror/python:3.11.13
+  before_script:
+    - apt-get update
+    - apt-get install -y patchelf
+  after_script:
+    - mv ./build/${APP_NAME} ./build/${APP_NAME}-linux-x64-${CI_COMMIT_TAG}
+    - mkdir -p release
+    - tar -czf ./release/${APP_NAME}-linux-x64-${CI_COMMIT_TAG}.tar.gz \
+      ./build/${APP_NAME}-linux-x64-${CI_COMMIT_TAG}/
 
 # build_macos_arm64:
 #   stage: build
@@ -107,24 +120,14 @@ build_windows_x64:
 #     - brew install create-dmg
 #     - ./build-dmg.sh
 #     - mkdir -p release
-#     - mv ${APP_NAME}.dmg ./release/.
-#     - zip -r "./release/${APP_NAME}-macos-arm64.zip" "${APP_NAME}.dmg"
+#     - mv "${APP_NAME} Installer.dmg" ./release/.
+#     - zip -r "./release/${APP_NAME}-macos-arm64-${CI_COMMIT_TAG}.zip" "${APP_NAME} Installer.dmg"
 #   artifacts:
 #     name: "build-${CI_COMMIT_SHA}"
 #     paths:
-#       - ./release/*.zip
+#       - ./release/*
 #     expire_in: 3 days
 
-build_linux_x64:
-  extends: .build
-  image: reg.mikumikumi.xyz/mirror/python:3.11.13
-  before_script:
-    - apt-get update
-    - apt-get install -y patchelf
-  after_script:
-    - mkdir release
-    - tar -czf ./release/${APP_NAME}-linux-x64.tar.gz Package/
-
 # bug: glab issues in private repositories
 # https://gitlab.com/gitlab-org/cli/-/issues/7859
 # https://gitlab.com/gitlab-org/gitlab/-/issues/568868

build-dmg.sh

@@ -8,4 +8,4 @@ create-dmg \
   --window-size 600 400 \
   --icon-size 100 \
   --app-drop-link 450 185 \
-  ${APP_NAME}.dmg ./build/${APP_NAME}.app
+  "${APP_NAME} Installer.dmg" ./build/${APP_NAME}.app