mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-24 04:24:09 +00:00
Merge pull request #45 from ngn999/staged
we can upload Apple Silicon version manually
This commit is contained in:
commit
d12f070ee6
149
.github/workflows/macos-m1.yml
vendored
149
.github/workflows/macos-m1.yml
vendored
|
@ -3,28 +3,31 @@ concurrency:
|
||||||
group: ${{ github.workflow }}-${{ github.ref }}
|
group: ${{ github.workflow }}-${{ github.ref }}
|
||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
on:
|
on:
|
||||||
|
# workflow_run:
|
||||||
|
# workflows: [AutoTag]
|
||||||
|
# types: [completed]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
# push:
|
push:
|
||||||
# branches:
|
branches:
|
||||||
# - dev
|
- dev
|
||||||
# - master
|
- master
|
||||||
# # - staged
|
# - staged
|
||||||
# paths-ignore:
|
paths-ignore:
|
||||||
# - 'docs/**'
|
- 'docs/**'
|
||||||
# - ".github/**"
|
- ".github/**"
|
||||||
# - "howto/**"
|
- "howto/**"
|
||||||
# - "*.md"
|
- "*.md"
|
||||||
# - ".clang-format"
|
- ".clang-format"
|
||||||
# pull_request:
|
pull_request:
|
||||||
# branches:
|
branches:
|
||||||
# - dev
|
- dev
|
||||||
# - master
|
- master
|
||||||
# # - staged
|
# - staged
|
||||||
# paths-ignore:
|
paths-ignore:
|
||||||
# - 'docs/**'
|
- 'docs/**'
|
||||||
# - ".github/**"
|
- ".github/**"
|
||||||
# - "howto/**"
|
- "howto/**"
|
||||||
# - "*.md"
|
- "*.md"
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Build
|
name: Build
|
||||||
|
@ -32,71 +35,20 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [macos-11]
|
os: [macos-11]
|
||||||
qt_ver: [6.2.2]
|
qt_ver: [6.2.4]
|
||||||
qt_arch: [clang_64]
|
qt_arch: [clang_64]
|
||||||
env:
|
env:
|
||||||
targetName: GoldenDict
|
targetName: GoldenDict
|
||||||
|
version: 22.4.7-alpha
|
||||||
|
|
||||||
steps:
|
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
|
- uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 0
|
||||||
- name: Set outputs
|
# - name: get current time
|
||||||
id: githash
|
# run: echo "REL_DATE=$(date +'%Y%m%d-%H%M%S')" >> $GITHUB_ENV
|
||||||
run: |
|
# - name: get OS version
|
||||||
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
|
# run: echo "OS_VER=$(sw_vers -productVersion)" >> $GITHUB_ENV
|
||||||
|
|
||||||
- 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
|
|
||||||
- name: Set outputs
|
- name: Set outputs
|
||||||
id: vars
|
id: vars
|
||||||
run: |
|
run: |
|
||||||
|
@ -104,25 +56,20 @@ jobs:
|
||||||
echo "::set-output name=release_date::$(date +'%Y%m%d')"
|
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::$(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')"
|
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
|
# tag 上传Release
|
||||||
# - name: uploadRelease
|
- name: publish
|
||||||
# uses: svenstaro/upload-release-action@v2
|
uses: softprops/action-gh-release@v1
|
||||||
# with:
|
with:
|
||||||
# repo_token: ${{ secrets.GITHUB_TOKEN }}
|
name: ${{ env.targetName }}-AppleSilicon-${{ matrix.qt_ver }}_${{ matrix.os }}_${{ steps.vars.outputs.sha_short }}
|
||||||
# file: ${{ env.targetName }}.dmg
|
draft: true
|
||||||
# asset_name: ${{ env.targetName }}-M1_${{ matrix.os }}_${{ matrix.qt_ver }}_${{ steps.vars.outputs.sha_short }}.dmg
|
env:
|
||||||
# tag: v${{ steps.autotag.outputs.version }}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
# 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 x86_64(Intel Kind)
|
|
||||||
# This is a prerelease version ,auto build by github action. use on your on risk:-)
|
|
||||||
|
|
Loading…
Reference in a new issue