Merge branch 'staged' into dev

xiaoyifang · May 12, 2022 · ea4eeaa · ea4eeaa
2 parents 18ad224 + 5acb767
commit ea4eeaa
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 881 deletions.
diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml
@@ -88,6 +88,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"           
       # tag 上传Release
       - name: uploadRelease

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -91,6 +91,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"           
       # tag 上传Release
       - name: uploadRelease

diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
@@ -95,6 +95,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"          
       - name: uploadRelease
         # if: startsWith(github.event.ref, 'refs/tags/')

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -92,6 +92,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"          
       - name: uploadRelease
         # if: startsWith(github.event.ref, 'refs/tags/')

diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml
@@ -67,6 +67,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"          
 
       # # msvc编译
@@ -134,15 +135,28 @@ jobs:
           overwrite: true 
           release_name: GoldenDict-v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: true
-          body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2,Qt6.X  ${{ matrix.qt_arch }}
-            Windows built with:   msvc64  Visual studio 2019
-                                  goldendict.exe was provided alone ,if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  qt6.X(Universal Build)
-                                  qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)   
+
+      - name: copy nsis 
+        shell: bash
+        run: |
+          cp tools/nsis/GoldenDict.nsi ${{ steps.package.outputs.packageName }}/
+      - name: Create installer
+        uses: joncloud/makensis-action@v3.6
+        with:
+          arguments: "/V3"
+          script-file: ${{ steps.package.outputs.packageName }}/GoldenDict.nsi
+      - name: make installer 
+        run: |
+          cd ${{ steps.package.outputs.packageName }} 
+          ls *.exe
+      - name: upload goldendict installer
+        # if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}/GoldenDict-v22-Install.exe
+          asset_name: ${{ matrix.qt_ver }}-GoldenDict-v22-Install.exe
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true 
+          release_name: GoldenDict-v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          prerelease: true
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -69,6 +69,7 @@ jobs:
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
           CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
           CHANGELOG="${CHANGELOG//'\"'/'%22'}"
+          CHANGELOG="${CHANGELOG//"'"/'%20'}"
           echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
       - uses: ilammy/msvc-dev-cmd@v1
       # msvc编译
@@ -97,13 +98,7 @@ jobs:
           & .github\scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName}
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name" 
-      # tag 查询github-Release
-      # 上传artifacts          
-#       - uses: actions/upload-artifact@v2
-#         with:
-#           name: ${{ steps.package.outputs.packageName }}
-#           path: ${{ steps.package.outputs.packageName }}.zip
-      # tag 上传Release
+
       - name: uploadRelease
         # if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
@@ -140,17 +135,32 @@ jobs:
           overwrite: true 
           release_name: GoldenDict-v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: true
-          body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2,Qt6.X  ${{ matrix.qt_arch }}
-            Windows built with:   msvc64  Visual studio 2019
-            ## goldendict.exe can not be used alone 
-            if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
 
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  qt6.X(Universal Build)
-                                  qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)   
+
+      - name: copy nsis 
+        shell: bash
+        run: |
+          ls -al
+          cp tools/nsis/GoldenDict.nsi ${{ steps.package.outputs.packageName }}/
+      - name: Create installer
+        uses: joncloud/makensis-action@v3.6
+        with:
+          arguments: "/V3"
+          script-file: ${{ steps.package.outputs.packageName }}/GoldenDict.nsi
+      - name: make installer 
+        run: |
+          ls *.exe
+          cd ${{ steps.package.outputs.packageName }} 
+          ls *.exe
+      - name: upload goldendict installer
+        # if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}/GoldenDict-v22-Install.exe
+          asset_name: ${{ matrix.qt_ver }}-GoldenDict-v22-Install.exe
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true 
+          release_name: GoldenDict-v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          prerelease: true
+