hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-01 01:44:09 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-05-11 20:14:14 +08:00
parent c835af3995 8caf5750d0
commit 18ad2240d3
6 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/macos-6.2.yml vendored
View file

@ -25,7 +25,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [macos-11] os: [macos-11]
qt_ver: [6.2.4] qt_ver: [6.2.4,6.3.0]
qt_arch: [clang_64] qt_arch: [clang_64]
env: env:
targetName: GoldenDict targetName: GoldenDict
@ -87,6 +87,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
# tag 上传Release # tag 上传Release
- name: uploadRelease - name: uploadRelease

1
.github/workflows/macos.yml vendored
View file

@ -90,6 +90,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
# tag 上传Release # tag 上传Release
- name: uploadRelease - name: uploadRelease

1
.github/workflows/ubuntu-6.2.yml vendored
View file

@ -94,6 +94,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
- name: uploadRelease - name: uploadRelease
# if: startsWith(github.event.ref, 'refs/tags/') # if: startsWith(github.event.ref, 'refs/tags/')

1
.github/workflows/ubuntu.yml vendored
View file

@ -91,6 +91,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
- name: uploadRelease - name: uploadRelease
# if: startsWith(github.event.ref, 'refs/tags/') # if: startsWith(github.event.ref, 'refs/tags/')

3
.github/workflows/windows-6.2.yml vendored
View file

@ -66,6 +66,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
# # msvc编译 # # msvc编译
@ -90,7 +91,7 @@ jobs:
- name: package - name: package
id: package id: package
env: env:
archiveName: GoldenDict-${{ github.ref_name }}.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }}
msvcArch: ${{ matrix.msvc_arch }} msvcArch: ${{ matrix.msvc_arch }}
shell: pwsh shell: pwsh
run: | run: |

3
.github/workflows/windows.yml vendored
View file

@ -68,6 +68,7 @@ jobs:
CHANGELOG="${CHANGELOG//'%'/'%25'}" CHANGELOG="${CHANGELOG//'%'/'%25'}"
CHANGELOG="${CHANGELOG//$'\n'/'%0A'}" CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
CHANGELOG="${CHANGELOG//$'\r'/'%0D'}" CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
CHANGELOG="${CHANGELOG//'\"'/'%22'}"
echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")" echo "::set-output name=COMMIT_SUMMARY::$(echo "$CHANGELOG")"
- uses: ilammy/msvc-dev-cmd@v1 - uses: ilammy/msvc-dev-cmd@v1
# msvc编译 # msvc编译
@ -89,7 +90,7 @@ jobs:
- name: package - name: package
id: package id: package
env: env:
archiveName: GoldenDict-${{ github.ref_name }}.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }}
msvcArch: ${{ matrix.msvc_arch }} msvcArch: ${{ matrix.msvc_arch }}
shell: pwsh shell: pwsh
run: | run: |