From 8d624d0574165ec0c513cc6dfc236849affd21b0 Mon Sep 17 00:00:00 2001 From: Mentalflow <312902918@qq.com> Date: Sun, 20 Aug 2023 16:05:48 +0800 Subject: [PATCH] Workflows: update package name in order to identify the shared and static build. --- .github/workflows/macos-shared.yml | 4 ++-- .github/workflows/macos-static.yml | 4 ++-- .github/workflows/ubuntu-shared.yml | 10 +++++----- .github/workflows/ubuntu-static.yml | 10 +++++----- .github/workflows/windows-mingw-shared.yml | 4 ++-- .github/workflows/windows-mingw-static.yml | 4 ++-- .github/workflows/windows-msvc-shared.yml | 4 ++-- .github/workflows/windows-msvc-static.yml | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/macos-shared.yml b/.github/workflows/macos-shared.yml index e4b9877..fc4e056 100644 --- a/.github/workflows/macos-shared.yml +++ b/.github/workflows/macos-shared.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}.zip + name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.zip path: /Users/runner/work/RibbonUI/RibbonUI/build/example/${{ env.targetName }}.app - name: uploadRelease @@ -68,6 +68,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /Users/runner/work/RibbonUI/RibbonUI/build/example/${{ env.targetName }}.dmg - asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg + asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_shared.dmg tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/macos-static.yml b/.github/workflows/macos-static.yml index b425e4b..afee1e3 100644 --- a/.github/workflows/macos-static.yml +++ b/.github/workflows/macos-static.yml @@ -59,7 +59,7 @@ jobs: - uses: actions/upload-artifact@v2 with: - name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}.zip + name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_static.zip path: /Users/runner/work/RibbonUI/RibbonUI/build/example/${{ env.targetName }}.app - name: uploadRelease @@ -68,6 +68,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: /Users/runner/work/RibbonUI/RibbonUI/build/example/${{ env.targetName }}.dmg - asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg + asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.dmg tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/ubuntu-shared.yml b/.github/workflows/ubuntu-shared.yml index a83ac31..8f6a8fc 100644 --- a/.github/workflows/ubuntu-shared.yml +++ b/.github/workflows/ubuntu-shared.yml @@ -71,19 +71,19 @@ jobs: export QML_SOURCES_PATHS=./ # 拷贝依赖 linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/RibbonUI/RibbonUI/build/example/${targetName} --appdir /home/runner/work/RibbonUI/RibbonUI/build/example/ - mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage + mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.AppImage - uses: actions/upload-artifact@v2 with: - name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}} - path: ${{ env.targetName }}.AppImage + name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared + path: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.AppImage - name: uploadRelease if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.targetName }}.AppImage - asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage + file: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.AppImage + asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_shared.AppImage tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/ubuntu-static.yml b/.github/workflows/ubuntu-static.yml index 4ee3750..6de459e 100644 --- a/.github/workflows/ubuntu-static.yml +++ b/.github/workflows/ubuntu-static.yml @@ -71,19 +71,19 @@ jobs: export QML_SOURCES_PATHS=./ # 拷贝依赖 linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/RibbonUI/RibbonUI/build/example/${targetName} --appdir /home/runner/work/RibbonUI/RibbonUI/build/example/ - mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage + mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage - uses: actions/upload-artifact@v2 with: - name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}} - path: ${{ env.targetName }}.AppImage + name: ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static + path: ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage - name: uploadRelease if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ env.targetName }}.AppImage - asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage + file: ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage + asset_name: ${{ env.targetName }}_${{ github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/windows-mingw-shared.yml b/.github/workflows/windows-mingw-shared.yml index 09eeba8..6f2be83 100644 --- a/.github/workflows/windows-mingw-shared.yml +++ b/.github/workflows/windows-mingw-shared.yml @@ -67,7 +67,7 @@ jobs: - name: package id: package env: - archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }} + archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}-shared shell: pwsh run: | & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName} @@ -85,6 +85,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip + asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}_shared.zip tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/windows-mingw-static.yml b/.github/workflows/windows-mingw-static.yml index 921df1e..3f7449d 100644 --- a/.github/workflows/windows-mingw-static.yml +++ b/.github/workflows/windows-mingw-static.yml @@ -67,7 +67,7 @@ jobs: - name: package id: package env: - archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }} + archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}-static shell: pwsh run: | & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName} @@ -85,6 +85,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip + asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}_static.zip tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/windows-msvc-shared.yml b/.github/workflows/windows-msvc-shared.yml index 9f5e699..3850520 100644 --- a/.github/workflows/windows-msvc-shared.yml +++ b/.github/workflows/windows-msvc-shared.yml @@ -60,7 +60,7 @@ jobs: - name: package id: package env: - archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }} + archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}-shared msvcArch: ${{ matrix.msvc_arch }} shell: pwsh run: | @@ -80,6 +80,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip + asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}_shared.zip tag: ${{ github.ref }} overwrite: true \ No newline at end of file diff --git a/.github/workflows/windows-msvc-static.yml b/.github/workflows/windows-msvc-static.yml index ae52155..5d50219 100644 --- a/.github/workflows/windows-msvc-static.yml +++ b/.github/workflows/windows-msvc-static.yml @@ -60,7 +60,7 @@ jobs: - name: package id: package env: - archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }} + archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}-static msvcArch: ${{ matrix.msvc_arch }} shell: pwsh run: | @@ -80,6 +80,6 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip + asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}_static.zip tag: ${{ github.ref }} overwrite: true \ No newline at end of file