From 40abd01e80d06409e0167690052a943b40b70505 Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Fri, 1 Apr 2022 20:26:50 +0800 Subject: [PATCH 1/2] change version from 22.2 to 22.4 --- .github/workflows/AutoTag.yml | 2 +- .github/workflows/macos-6.2.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu-6.2.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows-6.2.yml | 2 +- .github/workflows/windows.yml | 2 +- goldendict.pro | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml index 7c74c7f90..0c702caaf 100644 --- a/.github/workflows/AutoTag.yml +++ b/.github/workflows/AutoTag.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest env: - version: 22.2.alpha + version: 22.4.alpha # 步骤 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml index 44894cc81..ebdb27d8e 100644 --- a/.github/workflows/macos-6.2.yml +++ b/.github/workflows/macos-6.2.yml @@ -39,7 +39,7 @@ jobs: qt_arch: [clang_64] env: targetName: GoldenDict - version: 22.2.alpha + version: 22.4.alpha steps: # macos 11.0 默认环境变了,要指定 diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0be38cbc0..9ad329275 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -39,7 +39,7 @@ jobs: qt_arch: [clang_64] env: targetName: GoldenDict - version: 22.2.alpha + version: 22.4.alpha steps: # macos 11.0 默认环境变了,要指定 diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index 866caf584..eb2df3d3f 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -39,7 +39,7 @@ jobs: qt_ver: [6.2.3] qt_arch: [gcc_64] env: - version: 22.2.alpha + version: 22.4.alpha steps: - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index eb0beb3ec..558c3123a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,7 +39,7 @@ jobs: qt_ver: [5.15.2] qt_arch: [gcc_64] env: - version: 22.2.alpha + version: 22.4.alpha steps: - name: Install Qt uses: jurplel/install-qt-action@v3 diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml index 7753b874e..ac9e5b3f3 100644 --- a/.github/workflows/windows-6.2.yml +++ b/.github/workflows/windows-6.2.yml @@ -53,7 +53,7 @@ jobs: qt_arch_install: msvc2019_64 env: targetName: GoldenDict.exe - version: 22.2.alpha + version: 22.4.alpha # 步骤 steps: # 安装Qt diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 68bff9dd2..a0736c46f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -52,7 +52,7 @@ jobs: # qt_arch_install: msvc2019_64 env: targetName: GoldenDict.exe - version: 22.2.alpha + version: 22.4.alpha # 步骤 steps: # 安装Qt diff --git a/goldendict.pro b/goldendict.pro index 0693fe427..d7f91c7fa 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = goldendict -VERSION = 22.2.alpha +VERSION = 22.4.alpha # Generate version file. We do this here and in a build rule described later. # The build rule is required since qmake isn't run each time the project is @@ -70,7 +70,7 @@ win32 { TARGET = GoldenDict win32-msvc* { - VERSION = 22.2 # VS does not recognize 22.2.alpha,cause errors during compilation under MSVC++ + VERSION = 22.4 # VS does not recognize 22.number.alpha,cause errors during compilation under MSVC++ DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS contains(QMAKE_TARGET.arch, x86_64) { DEFINES += NOMINMAX __WIN64 From 5d2426c805637324479e9eefd3bb9fbf050871d5 Mon Sep 17 00:00:00 2001 From: xiaoyifang Date: Fri, 1 Apr 2022 20:58:20 +0800 Subject: [PATCH 2/2] github:workflow changes --- .github/workflows/macos-6.2.yml | 48 +++++++++++++++--------------- .github/workflows/macos.yml | 48 +++++++++++++++--------------- .github/workflows/ubuntu-6.2.yml | 42 +++++++++++++------------- .github/workflows/ubuntu.yml | 48 +++++++++++++++--------------- .github/workflows/windows-6.2.yml | 49 +++++++++++++++---------------- .github/workflows/windows.yml | 49 +++++++++++++++---------------- 6 files changed, 141 insertions(+), 143 deletions(-) diff --git a/.github/workflows/macos-6.2.yml b/.github/workflows/macos-6.2.yml index ebdb27d8e..0481f333f 100644 --- a/.github/workflows/macos-6.2.yml +++ b/.github/workflows/macos-6.2.yml @@ -3,31 +3,31 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - workflow_run: - workflows: [AutoTag] - types: [completed] + # workflow_run: + # workflows: [AutoTag] + # types: [completed] workflow_dispatch: - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9ad329275..78cadb652 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,31 +3,31 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - workflow_run: - workflows: [AutoTag] - types: [completed] + # workflow_run: + # workflows: [AutoTag] + # types: [completed] workflow_dispatch: - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml index eb2df3d3f..1f23b670c 100644 --- a/.github/workflows/ubuntu-6.2.yml +++ b/.github/workflows/ubuntu-6.2.yml @@ -8,27 +8,27 @@ on: # workflows: [AutoTag] # types: [completed] workflow_dispatch: - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 558c3123a..a4aef7ac5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -4,31 +4,31 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - workflow_run: - workflows: [AutoTag] - types: [completed] + # workflow_run: + # workflows: [AutoTag] + # types: [completed] workflow_dispatch: - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build diff --git a/.github/workflows/windows-6.2.yml b/.github/workflows/windows-6.2.yml index ac9e5b3f3..547e43342 100644 --- a/.github/workflows/windows-6.2.yml +++ b/.github/workflows/windows-6.2.yml @@ -3,32 +3,31 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - workflow_run: - workflows: [AutoTag] - types: [completed] + # workflow_run: + # workflows: [AutoTag] + # types: [completed] workflow_dispatch: - # push代码时触发workflow - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a0736c46f..ea26ef83c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,32 +3,31 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true on: - workflow_run: - workflows: [AutoTag] - types: [completed] + # workflow_run: + # workflows: [AutoTag] + # types: [completed] workflow_dispatch: - # push代码时触发workflow - # push: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" - # - ".clang-format" - # pull_request: - # branches: - # - dev - # - master - # # - staged - # paths-ignore: - # - 'docs/**' - # - ".github/**" - # - "howto/**" - # - "*.md" + push: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" + - ".clang-format" + pull_request: + branches: + - dev + - master + # - staged + paths-ignore: + - 'docs/**' + - ".github/**" + - "howto/**" + - "*.md" jobs: build: name: Build