Skip to content

Commit a7d9794

Browse files
variarvariar
authored
Merge branch 'master' into const-ref
2 parents 00a87c6 + 7397f7f commit a7d9794

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3138
-1451
lines changed

‎.github/actions/agent-package-mac/action.yml

+27-29
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ inputs:
55
required: true
66
p12-password:
77
required: true
8-
appstore-connect-username:
8+
notarization-username:
99
required: true
10-
appstore-connect-password:
10+
notarization-team:
11+
required: true
12+
notarization-password:
1113
required: true
1214

1315
runs:
@@ -20,7 +22,7 @@ runs:
2022
with:
2123
p12-file-base64: ${{ inputs.p12-file-base64 }}
2224
p12-password: ${{ inputs.p12-password }}
23-
25+
2426
- name: Mac deploy Qt
2527
shell: sh
2628
run: |
@@ -31,13 +33,13 @@ runs:
3133
if: "startsWith(matrix.config.qt_version, '5')"
3234
shell: sh
3335
run: |
34-
python2 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt5_DIR
36+
python3 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt5_DIR
3537
3638
- name: Mac deploy Qt fixing
3739
if: "startsWith(matrix.config.qt_version, '6')"
3840
shell: sh
3941
run: |
40-
python2 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt6_DIR
42+
python3 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt6_DIR
4143
4244
- name: Set packaging env
4345
shell: sh
@@ -82,38 +84,34 @@ runs:
8284
pkgutil --expand ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-product.pkg ./output/klogg_product_pkg
8385
pkgutil --flatten ./output/klogg_product_pkg ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-flatten.pkg
8486
productsign --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-flatten.pkg ./packages/${{ env.KLOGG_PKG }}
87+
88+
- name: Setup Xcode
89+
shell: sh
90+
run: sudo xcode-select -s /Applications/Xcode_13.2.1.app
8591

86-
- name: "Mac notarize DMG"
92+
- name: Mac notarize DMG
8793
if: ${{ github.event_name != 'pull_request' }}
88-
uses: variar/[email protected]
89-
with:
90-
verbose: true
91-
product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
92-
primary-bundle-id: "dev.filimonov.klogg"
93-
appstore-connect-username: ${{ inputs.appstore-connect-username }}
94-
appstore-connect-password: ${{ inputs.appstore-connect-password }}
94+
shell: sh
95+
run: |
96+
xcrun notarytool submit --wait --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
9597
96-
- name: "Mac staple DMG"
98+
- name: Mac staple DMG
9799
if: ${{ github.event_name != 'pull_request' }}
98-
uses: devbotsxyz/xcode-staple@v1
99-
with:
100-
product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
100+
shell: sh
101+
run: |
102+
xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
101103
102-
- name: "Mac notarize PKG"
104+
- name: Mac notarize PKG
103105
if: ${{ github.event_name != 'pull_request' }}
104-
uses: variar/[email protected]
105-
with:
106-
verbose: true
107-
product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
108-
primary-bundle-id: "dev.filimonov.klogg"
109-
appstore-connect-username: ${{ inputs.appstore-connect-username }}
110-
appstore-connect-password: ${{ inputs.appstore-connect-password }}
106+
shell: sh
107+
run: |
108+
xcrun notarytool submit --wait --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
111109
112-
- name: "Mac staple PKG"
110+
- name: Mac staple PKG
113111
if: ${{ github.event_name != 'pull_request' }}
114-
uses: devbotsxyz/xcode-staple@v1
115-
with:
116-
product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
112+
shell: sh
113+
run: |
114+
xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
117115
118116
- name: Mac symbols
119117
shell: sh

‎.github/actions/klogg-version/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ runs:
66
- name: Set klogg version
77
shell: sh
88
run: |
9-
echo "KLOGG_VERSION=23.08.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV
9+
echo "KLOGG_VERSION=24.11.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV

‎.github/workflows/ci-build.yml

+24-38
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ jobs:
7070
container: variar/klogg_oracle8
7171
cmake_opts: -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
7272

73-
- os: ubuntu_bionic
74-
os_version: 18.04
75-
arch: x64
76-
check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
77-
cpack_gen: DEB
78-
artifacts_id: bionic
79-
package_suffix: deb
80-
check_container: ubuntu:18.04
81-
container_root: docker/ubuntu18.04
82-
container: variar/klogg_ubuntu18.04
83-
cmake_opts: -DKLOGG_USE_LTO=OFF
84-
8573
- os: ubuntu_focal
8674
os_version: 20.04
8775
arch: x64
@@ -106,16 +94,28 @@ jobs:
10694
container: variar/klogg_ubuntu22.04
10795
cmake_opts:
10896

97+
- os: ubuntu_noble
98+
os_version: 24.04
99+
arch: x64
100+
check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
101+
cpack_gen: DEB
102+
artifacts_id: noble
103+
package_suffix: deb
104+
check_container: ubuntu:24.04
105+
container_root: docker/ubuntu24.04
106+
container: variar/klogg_ubuntu24.04
107+
cmake_opts:
108+
109109
- os: ubuntu_appimage
110-
os_version: 18.04
110+
os_version: 20.04
111111
arch: x64
112112
#check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
113113
#cpack_gen: DEB
114114
artifacts_id: appimage
115115
package_suffix: AppImage
116116
#check_container: ubuntu:18.04
117-
container_root: docker/ubuntu18.04_qt5.15
118-
container: variar/klogg_ubuntu18.04_qt5.15
117+
container_root: docker/ubuntu20.04_qt5.15
118+
container: variar/klogg_ubuntu20.04_qt5.15
119119
cmake_opts: -DKLOGG_USE_LTO=OFF -DCMAKE_PREFIX_PATH=/opt/qt515/
120120

121121

@@ -152,19 +152,12 @@ jobs:
152152
matrix:
153153
config:
154154
- os: macos
155-
os_version: 11
156-
qt_version: 5.15.2
157-
qt_modules:
158-
arch: x64
159-
artifacts_id: macos-qt5
160-
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.14
161-
- os: macos
162-
os_version: 11
163-
qt_version: 6.5.1
155+
os_version: 12
156+
qt_version: 6.7.3
164157
qt_modules: qt5compat
165158
arch: x64
166159
artifacts_id: macos-qt6
167-
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.15
160+
cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=11.7
168161

169162
runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
170163
steps:
@@ -190,8 +183,9 @@ jobs:
190183
with:
191184
p12-file-base64: ${{ secrets.CODESIGN_BASE64 }}
192185
p12-password: ${{ secrets.CODESIGN_PASSWORD }}
193-
appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
194-
appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
186+
notarization-username: ${{ secrets.NOTARIZATION_USERNAME }}
187+
notarization-team: ${{ secrets.NOTARIZATION_TEAM }}
188+
notarization-password: ${{ secrets.NOTARIZATION_PASSWORD }}
195189

196190
- uses: actions/upload-artifact@v3
197191
with:
@@ -207,15 +201,7 @@ jobs:
207201
config:
208202
- os: windows
209203
os_version: 2022
210-
qt_version: 5.15.2
211-
arch: x64
212-
ssl_arch: -x64
213-
cmake_opts:
214-
artifacts_id: windows-x64-qt5
215-
216-
- os: windows
217-
os_version: 2022
218-
qt_version: 6.5.1
204+
qt_version: 6.7.3
219205
qt_modules: qt5compat
220206
arch: x64
221207
ssl_arch: -x64
@@ -239,12 +225,12 @@ jobs:
239225
uses: actions/cache@v2
240226
with:
241227
path: ${{ github.workspace }}\openssl-1.1
242-
key: OpensslCache-1-1-1n
228+
key: OpensslCache-1-1-1w
243229

244230
- name: Download openssl
245231
if: ${{ steps.cache-openssl.outputs.cache-hit != 'true' }}
246232
run: |
247-
Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1-zip" -OutFile openssl.zip
233+
Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1.1.1-zip" -OutFile openssl.zip
248234
7z x openssl.zip
249235
250236
- name: Set openssl paths

‎.github/workflows/ci-release.yml

+6-11
Original file line numberDiff line numberDiff line change
@@ -50,44 +50,41 @@ jobs:
5050
- name: Upload symbols linux
5151
shell: sh
5252
run: |
53-
xz -d ./packages-bionic/klogg_bionic.debug.xz
5453
xz -d ./packages-focal/klogg_focal.debug.xz
5554
xz -d ./packages-jammy/klogg_jammy.debug.xz
55+
xz -d ./packages-noble/klogg_noble.debug.xz
5656
xz -d ./packages-oracle/klogg_oracle.debug.xz
5757
xz -d ./packages-appimage/klogg_appimage.debug.xz
58-
sentry-cli upload-dif ./packages-bionic/klogg_bionic.debug ./packages-bionic/klogg_bionic
5958
sentry-cli upload-dif ./packages-focal/klogg_focal.debug ./packages-focal/klogg_focal
6059
sentry-cli upload-dif ./packages-jammy/klogg_jammy.debug ./packages-jammy/klogg_jammy
60+
sentry-cli upload-dif ./packages-noble/klogg_noble.debug ./packages-noble/klogg_noble
6161
sentry-cli upload-dif ./packages-oracle/klogg_oracle.debug ./packages-oracle/klogg_oracle
6262
sentry-cli upload-dif ./packages-appimage/klogg_appimage.debug ./packages-appimage/klogg_appimage
6363
6464
- name: Upload symbols mac
6565
shell: sh
6666
run: |
67-
sentry-cli upload-dif ./packages-macos-qt5/klogg-Qt5.app/Contents/MacOS/klogg ./packages-macos-qt5/klogg-Qt5.dSym
6867
sentry-cli upload-dif ./packages-macos-qt6/klogg-Qt6.app/Contents/MacOS/klogg ./packages-macos-qt6/klogg-Qt6.dSym
6968
7069
- name: Upload symbols win
7170
shell: sh
7271
run: |
73-
sentry-cli upload-dif ./packages-windows-x64-qt5/klogg-$KLOGG_VERSION-x64-Qt5-pdb.zip
7472
sentry-cli upload-dif ./packages-windows-x86-qt5/klogg-$KLOGG_VERSION-x86-Qt5-pdb.zip
7573
sentry-cli upload-dif ./packages-windows-x64-qt6/klogg-$KLOGG_VERSION-x64-Qt6-pdb.zip
7674
7775
- name: Cleanup release artifacts
7876
shell: sh
7977
run: |
80-
rm -rf ./packages-bionic/klogg_bionic
8178
rm -rf ./packages-focal/klogg_focal
8279
rm -rf ./packages-jammy/klogg_jammy
80+
rm -rf ./packages-noble/klogg_noble
8381
rm -rf ./packages-oracle/klogg_oracle
8482
rm -rf ./packages-appimage/klogg_appimage
85-
rm -rf ./packages-macos-qt5/klogg-Qt5.app
8683
rm -rf ./packages-macos-qt6/klogg-Qt6.app
8784
mkdir ./linux-debug
88-
mv ./packages-bionic/klogg_bionic.debug ./linux-debug
8985
mv ./packages-focal/klogg_focal.debug ./linux-debug
9086
mv ./packages-jammy/klogg_jammy.debug ./linux-debug
87+
mv ./packages-noble/klogg_noble.debug ./linux-debug
9188
mv ./packages-oracle/klogg_oracle.debug ./linux-debug
9289
mv ./packages-appimage/klogg_appimage.debug ./linux-debug
9390
tar -cJf ./linux-debug/klogg-$KLOGG_VERSION-symbols.tar.xz ./linux-debug/*
@@ -104,7 +101,7 @@ jobs:
104101
- name: Prepare checksums
105102
shell: sh
106103
run: |
107-
sha256sum --binary ./packages-bin/* ./packages-bionic/* ./packages-focal/* ./packages-jammy/* ./packages-oracle/* ./packages-appimage/* > ./packages-bin/klogg-$KLOGG_VERSION-sha256.txt
104+
sha256sum --binary ./packages-bin/* ./packages-focal/* ./packages-jammy/* ./packages-noble/* ./packages-oracle/* ./packages-appimage/* > ./packages-bin/klogg-$KLOGG_VERSION-sha256.txt
108105
109106
- name: Release win
110107
uses: "marvinpinto/action-automatic-releases@latest"
@@ -113,7 +110,6 @@ jobs:
113110
automatic_release_tag: continuous-win
114111
prerelease: true
115112
files: |
116-
./packages-windows-x64-qt5/*
117113
./packages-windows-x86-qt5/*
118114
./packages-windows-x64-qt6/*
119115
@@ -124,9 +120,9 @@ jobs:
124120
automatic_release_tag: continuous-linux
125121
prerelease: true
126122
files: |
127-
./packages-bionic/*
128123
./packages-focal/*
129124
./packages-jammy/*
125+
./packages-noble/*
130126
./packages-oracle/*
131127
./packages-appimage/*
132128
./packages-bin/*
@@ -139,7 +135,6 @@ jobs:
139135
automatic_release_tag: continuous-osx
140136
prerelease: true
141137
files: |
142-
./packages-macos-qt5/*
143138
./packages-macos-qt6/*
144139
145140
- name: Discord notification

0 commit comments

Comments
 (0)