bump release version to 22.4.18-summer

xiaoyifang · Apr 18, 2022 · f6ce1c2 · f6ce1c2
2 parents f9978dd + d6810a8
commit f6ce1c2
Show file tree

Hide file tree

Showing 53 changed files with 1,011 additions and 619 deletions.
diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml
@@ -31,21 +31,22 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 22.4.Summer
+      version: 22.4.18-Summer
     # 步骤
     steps:
       - uses: actions/checkout@v3
 
       - name: set git short sha
-        id: git
+        id: vars
         run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"    
+          echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"   
+          echo "::set-output name=release_hm::$(date +'%y%m%d')"             
       - name: Bump version and push tag
         id: tag_version
         uses: mathieudutour/github-tag-action@v6.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{env.version}}-${{ steps.git.outputs.sha_short }}
+          custom_tag: ${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
 
 
 
diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml
@@ -35,11 +35,11 @@ jobs:
     strategy:
       matrix:
         os: [macos-11]
-        qt_ver: [6.2.3]
+        qt_ver: [6.3.0]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 22.4.Summer
+      version: 22.4.18-Summer
 
     steps:
       # macos 11.0 默认环境变了,要指定
@@ -58,7 +58,7 @@ jobs:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
           cached: 'false'
-          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia
+          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats
           setup-python: 'false'
           py7zrversion: '==0.18.1'
       - uses: actions/checkout@v3
@@ -71,22 +71,35 @@ jobs:
           tar xvjf eb-4.4.3.tar.bz2
           cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
           #brew install qt # or use official offline installer
-          brew install opencc libao hunspell ffmpeg@5 libtiff xz lzo libogg libvorbis zstd
+          brew install opencc hunspell ffmpeg@5 libtiff xz lzo libogg libvorbis zstd
+          brew install create-dmg
           qmake CONFIG+=release   CONFIG+=zim_support   CONFIG+=chinese_conversion_support
-          make 
+          make -j 8
       # 打包
       - name: package
         run: |
-          macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
-          otool -L  GoldenDict.app/Contents/MacOS/GoldenDict
+          macdeployqt ${targetName}.app -qmldir=. -verbose=1
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libswresample.4.dylib" "@executable_path/../Frameworks/libswresample.4.dylib" "GoldenDict.app/Contents/Frameworks//libavcodec.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libavcodec.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavcodec.59.dylib" "@executable_path/../Frameworks/libavcodec.59.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libswresample.4.dylib" "@executable_path/../Frameworks/libswresample.4.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libswresample.4.dylib"
+          install_name_tool -change  "/usr/local/Cellar/nettle/3.7.3/lib/libnettle.8.dylib" "@executable_path/../Frameworks/libnettle.8.dylib" "GoldenDict.app/Contents/Frameworks//libhogweed.6.dylib"
+          otool -L GoldenDict.app/Contents/MacOS/GoldenDict
+          otool -L GoldenDict.app/Contents/Frameworks/lib*
+          mkdir tmp
+          mv ${targetName}.app ./tmp
+          # --background "installer_background.png"
+          create-dmg --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/
       - name: Set outputs
         id: vars
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"    
           echo "::set-output name=release_date::$(date +'%Y%m%d')"    
           echo "::set-output name=release_time::$(date +'%H%M%S')"  
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
-
+          echo "::set-output name=release_hm::$(date +'%y%m%d')"  
           previousTag=$(git tag --sort=-creatordate | sed -n 2p)
           echo "previousTag : $previousTag"
           
@@ -102,7 +115,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.dmg
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}.dmg
-          tag: v${{env.version}}-${{ steps.vars.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: false

diff --git a/.github/workflows/macos-m1.yml b/.github/workflows/macos-m1.yml
@@ -3,6 +3,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
+  # workflow_run:
+  #   workflows: [AutoTag]
+  #   types: [completed]
   workflow_dispatch:
   # push:
   #   branches:
@@ -32,96 +35,41 @@ jobs:
     strategy:
       matrix:
         os: [macos-11]
-        qt_ver: [6.2.2]
+        qt_ver: [6.3.0]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
+      version: 22.4.7-alpha
+
     steps:
-      - name: prepare env
-        run: |
-          softwareupdate --all --install --force
-          sudo xcode-select --switch /Applications/Xcode.app
-          sudo xcode-select --print-path
-          #sudo xcode-select --switch /Library/Developer/CommandLineTools  
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_ver }}
-          arch: ${{ matrix.qt_arch }}
-          cached: 'false'
-          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia 
-          setup-python: 'false'              
       - uses: actions/checkout@v3
         with:
-          fetch-depth: 1
-      - name: Set outputs
-        id: githash
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"   
-       
-      - name: build macos
-        run: |
-          brew install pcre2 harfbuzz freetype
-          brew install cmake ninja python
-          brew install automake
-          brew install autoconf
-          brew install libtool
-          git clone https://github.com/xiph/vorbis.git
-          cd vorbis
-          ./autogen.sh
-          ./configure
-          make
-          sudo make install
-          cd ..
-          brew install opencc
-          brew install ffmpeg@5
-          #brew reinstall $(brew deps ffmpeg) ffmpeg
-          brew install libao
-          brew install libiconv
-          brew install lzo
-          brew install libogg
-          brew install zstd
-          brew install libtiff
-          #brew install libvorbis --force
-          #brew link libvorbis --force
-          brew install hunspell
-
-          # brew install qt@6
-          brew install pkg-config
-          # CONFIG+=chinese_conversion_support
-          #file /usr/local/lib/libzstd.dylib
-          file /usr/local/lib/QtGui.framework/QtGui
-          qmake CONFIG+=no_extra_tiff_handler CONFIG+=release CONFIG+=zim_support QMAKE_APPLE_DEVICE_ARCHS="arm64" CONFIG+=no_epwing_support CONFIG+=no_ffmpeg_player #CONFIG+=no_qtmultimedia_player
-          make 
-      # 打包
-      - name: package
-        run: |
-          macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
+          fetch-depth: 0
+      # - name: get current time
+      #   run: echo "REL_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_ENV
+      # - name: get OS version
+      #   run: echo "OS_VER=$(sw_vers -productVersion)" >> $GITHUB_ENV
       - name: Set outputs
         id: vars
         run: |
           echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"    
           echo "::set-output name=release_date::$(date +'%Y%m%d')"    
           echo "::set-output name=release_time::$(date +'%H%M%S')"  
-          echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"    
+          echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
+          echo "::set-output name=release_hm::$(date +'%y%m%d%H%M')"  
+          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          echo "previousTag : $previousTag"
+          
+          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
+          CHANGELOG="${CHANGELOG//'%'/'%25'}"
+          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
+          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
+          echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"           
       # tag 上传Release
-#       - name: uploadRelease
-#         uses: svenstaro/upload-release-action@v2
-#         with:
-#           repo_token: ${{ secrets.GITHUB_TOKEN }}
-#           file: ${{ env.targetName }}.dmg
-#           asset_name: ${{ env.targetName }}-M1_${{ matrix.os }}_${{ matrix.qt_ver }}_${{ steps.vars.outputs.sha_short }}.dmg
-#           tag: v${{ steps.autotag.outputs.version }}-${{ steps.vars.outputs.sha_short }}
-#           overwrite: true 
-#           release_name: win-ubuntu-macos-${{ github.ref_name }}-${{steps.vars.outputs.release_date}} 
-#           prerelease: false
-#           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:           ${{ matrix.qt_ver }} ${{ 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(Intel Kind)
-#             This is a prerelease version ,auto build by github action. use on your on risk:-)   
+      - name: publish
+        uses: softprops/action-gh-release@v1
+        with:
+          name: ${{ env.targetName }}-AppleSilicon-${{ matrix.qt_ver }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}
+          draft: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -39,7 +39,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 22.4.Summer
+      version: 22.4.18-Summer
 
     steps:
       # macos 11.0 默认环境变了,要指定
@@ -54,7 +54,7 @@ jobs:
         with:
           python-version: '3.9'          
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         # if: ${{ matrix.qt_ver == '5.15.2' }}
         with:
           version: ${{ matrix.qt_ver }}
@@ -71,14 +71,28 @@ jobs:
           tar xvjf eb-4.4.3.tar.bz2
           cd eb-4.4.3 && ./configure && make -j 8 && sudo make install && cd ..
           #brew install qt # or use official offline installer
-          brew install opencc libao hunspell ffmpeg@5 libtiff xz lzo libogg libvorbis zstd
+          brew install opencc hunspell ffmpeg@5 libtiff xz lzo libogg libvorbis zstd
+          brew install create-dmg
           qmake CONFIG+=release   CONFIG+=zim_support   CONFIG+=chinese_conversion_support
-          make 
+          make -j 8
       # 打包
       - name: package
         run: |
-          macdeployqt ${targetName}.app -qmldir=. -verbose=1 -dmg
-          otool -L  GoldenDict.app/Contents/MacOS/GoldenDict
+          macdeployqt ${targetName}.app -qmldir=. -verbose=1
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libswresample.4.dylib" "@executable_path/../Frameworks/libswresample.4.dylib" "GoldenDict.app/Contents/Frameworks//libavcodec.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libavcodec.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavcodec.59.dylib" "@executable_path/../Frameworks/libavcodec.59.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libswresample.4.dylib" "@executable_path/../Frameworks/libswresample.4.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libavformat.59.dylib"
+          install_name_tool -change  "/usr/local/Cellar/ffmpeg/5.0.1/lib/libavutil.57.dylib" "@executable_path/../Frameworks/libavutil.57.dylib" "GoldenDict.app/Contents/Frameworks//libswresample.4.dylib"
+          install_name_tool -change  "/usr/local/Cellar/nettle/3.7.3/lib/libnettle.8.dylib" "@executable_path/../Frameworks/libnettle.8.dylib" "GoldenDict.app/Contents/Frameworks//libhogweed.6.dylib"
+          otool -L GoldenDict.app/Contents/MacOS/GoldenDict
+          otool -L GoldenDict.app/Contents/Frameworks/lib*
+          mkdir tmp
+          mv ${targetName}.app ./tmp
+          # --background "installer_background.png"
+          create-dmg --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/
+
 
       - name: Set outputs
         id: vars
@@ -87,7 +101,7 @@ jobs:
           echo "::set-output name=release_date::$(date +'%Y%m%d')"    
           echo "::set-output name=release_time::$(date +'%H%M%S')"  
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
-
+          echo "::set-output name=release_hm::$(date +'%y%m%d')"  
           previousTag=$(git tag --sort=-creatordate | sed -n 2p)
           echo "previousTag : $previousTag"
           
@@ -103,7 +117,7 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.dmg
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}.dmg
-          tag: v${{env.version}}-${{ steps.vars.outputs.sha_short }}
+          tag: v${{env.version}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: win-linux-macos-${{steps.vars.outputs.release_date}} 
           prerelease: false