diff --git a/.github/workflows/macos copy.yml b/.github/workflows/macos copy.yml index 354737665..be6c19354 100644 --- a/.github/workflows/macos copy.yml +++ b/.github/workflows/macos copy.yml @@ -31,47 +31,70 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-11.0] - qt_ver: [5.15.2] + os: [macos-11] + qt_ver: [6.2.2] qt_arch: [clang_64] env: targetName: GoldenDict - version: 22.2.alpha steps: - # macos 11.0 默认环境变了,要指定 - name: prepare env - if: ${{ matrix.os == 'macos-11.0' }} run: | softwareupdate --all --install --force + sudo xcode-select --switch /Applications/Xcode.app sudo xcode-select --print-path - sudo xcode-select --switch /Library/Developer/CommandLineTools + #sudo xcode-select --switch /Library/Developer/CommandLineTools - name: Install Qt - uses: jurplel/install-qt-action@v2 + uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_ver }} + arch: ${{ matrix.qt_arch }} cached: 'false' - modules: qtwebengine - - uses: actions/checkout@v2 + modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia + - uses: actions/checkout@v3 with: fetch-depth: 1 - name: Set outputs id: githash run: | - echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)" - - uses: Klemensas/action-autotag@stable - id: autotag - with: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - tag_prefix: "v" - tag_suffix: "-${{ steps.githash.outputs.sha_short }}" + echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + - name: build macos run: | - qmake CONFIG+=release CONFIG+=zim_support CONFIG+=chinese_conversion_support QMAKE_APPLE_DEVICE_ARCHS=arm64 + 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 - name: Set outputs id: vars @@ -81,23 +104,23 @@ jobs: echo "::set-output name=release_time::$(date +'%H%M%S')" echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')" # 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${{env.version}}-${{ steps.vars.outputs.sha_short }} - overwrite: true - release_name: win-linux-macos-${{steps.vars.outputs.release_date}} - 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: ${{ 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 - auto built by github action. use on your on risk:-) +# - 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: 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: ${{ 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 +# This is a prerelease version ,auto build by github action. use on your on risk:-)