Skip to content

Commit bd1601c

Browse files
kaeeraakaeeraa
committed
ci(new): final patches
Signed-off-by: kaeeraa <kaeeraa@nebula-nook.ru>
1 parent 9d39908 commit bd1601c

8 files changed

Lines changed: 209 additions & 172 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -11,61 +11,20 @@ on:
1111
description: Enable Qt caching or not
1212
type: boolean
1313
default: true
14-
secrets:
15-
SPARKLE_ED25519_KEY:
16-
description: Private key for signing Sparkle updates
17-
required: false
18-
WINDOWS_CODESIGN_CERT:
19-
description: Certificate for signing Windows builds
20-
required: false
21-
WINDOWS_CODESIGN_PASSWORD:
22-
description: Password for signing Windows builds
23-
required: false
24-
APPLE_CODESIGN_CERT:
25-
description: Certificate for signing macOS builds
26-
required: false
27-
APPLE_CODESIGN_PASSWORD:
28-
description: Password for signing macOS builds
29-
required: false
30-
APPLE_CODESIGN_ID:
31-
description: Certificate ID for signing macOS builds
32-
required: false
33-
APPLE_NOTARIZE_APPLE_ID:
34-
description: Apple ID used for notarizing macOS builds
35-
required: false
36-
APPLE_NOTARIZE_TEAM_ID:
37-
description: Team ID used for notarizing macOS builds
38-
required: false
39-
APPLE_NOTARIZE_PASSWORD:
40-
description: Password used for notarizing macOS builds
41-
required: false
42-
GPG_PRIVATE_KEY:
43-
description: Private key for AppImage signing
44-
required: false
45-
GPG_PRIVATE_KEY_ID:
46-
description: ID for the GPG_PRIVATE_KEY, to select the signing key
47-
required: false
4814

4915
jobs:
50-
build:
51-
runs-on: ubuntu-22.04
52-
steps:
53-
##
54-
# PREPARE
55-
##
56-
- name: Checkout
57-
uses: actions/checkout@v4
58-
with:
59-
submodules: "true"
60-
61-
- name: "Run Windows build process"
62-
if: runner.os == 'Windows'
63-
uses: ./.github/workflows/by-os/windows.yml
64-
65-
- name: "Run Linux build process"
66-
if: runner.os == 'Linux'
67-
uses: ./.github/workflows/by-os/linux.yml
68-
69-
- name: "Run MacOS build process"
70-
if: runner.os == 'MacOS'
71-
uses: ./.github/workflows/by-os/macos.yml
16+
windows:
17+
uses: ./.github/workflows/windows.yml
18+
with:
19+
is_qt_cached: ${{inputs.is_qt_cached}}
20+
build_type: ${{inputs.build_type}}
21+
linux:
22+
uses: ./.github/workflows/linux.yml
23+
with:
24+
is_qt_cached: ${{inputs.is_qt_cached}}
25+
build_type: ${{inputs.build_type}}
26+
macos:
27+
uses: ./.github/workflows/macos.yml
28+
with:
29+
is_qt_cached: ${{inputs.is_qt_cached}}
30+
build_type: ${{inputs.build_type}}

.github/workflows/by-os/linux.yml renamed to .github/workflows/linux.yml

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,78 @@
11
name: Linux build process
22

3+
on:
4+
workflow_call:
5+
inputs:
6+
build_type:
7+
required: true
8+
type: string
9+
is_qt_cached:
10+
required: true
11+
type: boolean
12+
secrets:
13+
GPG_PRIVATE_KEY:
14+
description: Private key for AppImage signing
15+
required: false
16+
GPG_PRIVATE_KEY_ID:
17+
description: ID for the GPG_PRIVATE_KEY, to select the signing key
18+
required: false
19+
320
jobs:
421
linux:
522
strategy:
623
fail-fast: true
724
matrix:
8-
- os: ubuntu-22.04
9-
qt_ver: 5
10-
qt_host: linux
11-
qt_arch: ""
12-
qt_version: "5.15.2"
13-
qt_modules: "qtnetworkauth"
14-
15-
- os: ubuntu-22.04
16-
qt_ver: 6
17-
qt_host: linux
18-
qt_arch: ""
19-
qt_version: "6.8.1"
20-
qt_modules: "qt5compat qtimageformats qtnetworkauth"
25+
include:
26+
- os: ubuntu-22.04
27+
qt_ver: 5
28+
qt_host: linux
29+
qt_arch: ""
30+
qt_version: "5.15.2"
31+
qt_modules: "qtnetworkauth"
32+
33+
- os: ubuntu-22.04
34+
qt_ver: 6
35+
qt_host: linux
36+
qt_arch: ""
37+
qt_version: "6.8.1"
38+
qt_modules: "qt5compat qtimageformats qtnetworkauth"
2139

2240
env:
2341
INSTALL_DIR: "install"
2442
INSTALL_PORTABLE_DIR: "install-portable"
2543
INSTALL_APPIMAGE_DIR: "install-appdir"
2644
BUILD_DIR: "build"
45+
CCACHE_VAR: ""
2746

2847
runs-on: ${{ matrix.os }}
2948
steps:
30-
- uses: .github/workflows/utils/set_short_version.yml
49+
- name: Checkout repository
50+
uses: actions/checkout@v4
51+
with:
52+
submodules: true
53+
54+
- name: Set short version
55+
shell: bash
56+
run: |
57+
ver_short=`git rev-parse --short HEAD`
58+
echo "VERSION=$ver_short" >> $GITHUB_ENV
3159
3260
- name: Install Dependencies (Linux)
3361
run: |
3462
sudo apt-get -y update
3563
sudo apt-get -y install ninja-build extra-cmake-modules scdoc appstream libxcb-cursor-dev
3664
37-
- uses: .github/workflows/utils/install_qt.yml
65+
- name: Install Qt (macOS, Linux & Windows MSVC)
66+
uses: jurplel/install-qt-action@v4
67+
with:
68+
aqtversion: "==3.1.*"
69+
py7zrversion: ">=0.20.2"
70+
version: ${{ matrix.qt_version }}
71+
target: "desktop"
72+
arch: ${{ matrix.qt_arch }}
73+
modules: ${{ matrix.qt_modules }}
74+
tools: ${{ matrix.qt_tools }}
75+
cache: ${{ inputs.is_qt_cached }}
3876

3977
- name: Prepare AppImage (Linux)
4078
if: matrix.qt_ver != 5

.github/workflows/by-os/macos.yml renamed to .github/workflows/macos.yml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
name: MacOS build process
22

3+
on:
4+
workflow_call:
5+
inputs:
6+
build_type:
7+
required: true
8+
type: string
9+
is_qt_cached:
10+
required: true
11+
type: boolean
12+
secrets:
13+
SPARKLE_ED25519_KEY:
14+
description: Private key for signing Sparkle updates
15+
required: false
16+
APPLE_CODESIGN_CERT:
17+
description: Certificate for signing macOS builds
18+
required: false
19+
APPLE_CODESIGN_PASSWORD:
20+
description: Password for signing macOS builds
21+
required: false
22+
APPLE_CODESIGN_ID:
23+
description: Certificate ID for signing macOS builds
24+
required: false
25+
APPLE_NOTARIZE_APPLE_ID:
26+
description: Apple ID used for notarizing macOS builds
27+
required: false
28+
APPLE_NOTARIZE_TEAM_ID:
29+
description: Team ID used for notarizing macOS builds
30+
required: false
31+
APPLE_NOTARIZE_PASSWORD:
32+
description: Password used for notarizing macOS builds
33+
required: false
34+
335
jobs:
436
macos:
537
strategy:
@@ -19,18 +51,38 @@ jobs:
1951
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
2052
INSTALL_DIR: "install"
2153
BUILD_DIR: "build"
54+
CCACHE_VAR: ""
2255
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
2356

2457
runs-on: ${{ matrix.os }}
2558
steps:
26-
- uses: .github/workflows/utils/set_short_version.yml
59+
- name: Checkout repository
60+
uses: actions/checkout@v4
61+
with:
62+
submodules: true
63+
64+
- name: Set short version
65+
shell: bash
66+
run: |
67+
ver_short=`git rev-parse --short HEAD`
68+
echo "VERSION=$ver_short" >> $GITHUB_ENV
2769
2870
- name: Install Dependencies (macOS)
2971
run: |
3072
brew update
3173
brew install ninja extra-cmake-modules
3274
33-
- uses: .github/workflows/utils/install_qt.yml
75+
- name: Install Qt (macOS, Linux & Windows MSVC)
76+
uses: jurplel/install-qt-action@v4
77+
with:
78+
aqtversion: "==3.1.*"
79+
py7zrversion: ">=0.20.2"
80+
version: ${{ matrix.qt_version }}
81+
target: "desktop"
82+
arch: ${{ matrix.qt_arch }}
83+
modules: ${{ matrix.qt_modules }}
84+
tools: ${{ matrix.qt_tools }}
85+
cache: ${{ inputs.is_qt_cached }}
3486

3587
- name: Setup java (macOS)
3688
uses: actions/setup-java@v4

‎.github/workflows/trigger_builds.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,3 @@ jobs:
2929
with:
3030
build_type: Debug
3131
is_qt_cached: true
32-
secrets:
33-
SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
34-
WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
35-
WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
36-
APPLE_CODESIGN_CERT: ${{ secrets.APPLE_CODESIGN_CERT }}
37-
APPLE_CODESIGN_PASSWORD: ${{ secrets.APPLE_CODESIGN_PASSWORD }}
38-
APPLE_CODESIGN_ID: ${{ secrets.APPLE_CODESIGN_ID }}
39-
APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
40-
APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
41-
APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
42-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
43-
GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}

‎.github/workflows/trigger_release.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ jobs:
1313
with:
1414
build_type: Release
1515
is_qt_cached: false
16-
secrets:
17-
SPARKLE_ED25519_KEY: ${{ secrets.SPARKLE_ED25519_KEY }}
18-
WINDOWS_CODESIGN_CERT: ${{ secrets.WINDOWS_CODESIGN_CERT }}
19-
WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
20-
APPLE_CODESIGN_CERT: ${{ secrets.APPLE_CODESIGN_CERT }}
21-
APPLE_CODESIGN_PASSWORD: ${{ secrets.APPLE_CODESIGN_PASSWORD }}
22-
APPLE_CODESIGN_ID: ${{ secrets.APPLE_CODESIGN_ID }}
23-
APPLE_NOTARIZE_APPLE_ID: ${{ secrets.APPLE_NOTARIZE_APPLE_ID }}
24-
APPLE_NOTARIZE_TEAM_ID: ${{ secrets.APPLE_NOTARIZE_TEAM_ID }}
25-
APPLE_NOTARIZE_PASSWORD: ${{ secrets.APPLE_NOTARIZE_PASSWORD }}
26-
GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
27-
GPG_PRIVATE_KEY_ID: ${{ secrets.GPG_PRIVATE_KEY_ID }}
2816

2917
create_release:
3018
needs: build_release

‎.github/workflows/utils/install_qt.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.github/workflows/utils/set_short_version.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)