Merge branch 'master' into refactor

variar · Nov 18, 2024 · 936cda4 · 936cda4
2 parents e572e08 + 9ae043e
commit 936cda4
Show file tree

Hide file tree

Showing 58 changed files with 3,137 additions and 1,449 deletions.
diff --git a/.github/actions/agent-package-mac/action.yml b/.github/actions/agent-package-mac/action.yml
@@ -5,9 +5,11 @@ inputs:
     required: true
   p12-password:
     required: true
-  appstore-connect-username:
+  notarization-username:
     required: true
-  appstore-connect-password:
+  notarization-team:
+    required: true
+  notarization-password:
     required: true
 
 runs:
@@ -20,7 +22,7 @@ runs:
       with: 
         p12-file-base64: ${{ inputs.p12-file-base64 }}
         p12-password: ${{ inputs.p12-password }}
-        
+
     - name: Mac deploy Qt
       shell: sh
       run: |
@@ -31,13 +33,13 @@ runs:
       if: "startsWith(matrix.config.qt_version, '5')"
       shell: sh
       run: |
-        python2 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt5_DIR
+        python3 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt5_DIR
 
     - name: Mac deploy Qt fixing
       if: "startsWith(matrix.config.qt_version, '6')"
       shell: sh
       run: |
-        python2 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt6_DIR
+        python3 $KLOGG_BUILD_ROOT/macdeployqtfix.py $KLOGG_BUILD_ROOT/output/klogg.app/Contents/MacOS/klogg $Qt6_DIR
     
     - name: Set packaging env
       shell: sh
@@ -82,38 +84,34 @@ runs:
         pkgutil --expand ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-product.pkg ./output/klogg_product_pkg
         pkgutil --flatten ./output/klogg_product_pkg ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-flatten.pkg
         productsign --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-flatten.pkg ./packages/${{ env.KLOGG_PKG }}
+    
+    - name: Setup Xcode
+      shell: sh
+      run: sudo xcode-select -s /Applications/Xcode_13.2.1.app
 
-    - name: "Mac notarize DMG"
+    - name: Mac notarize DMG 
       if: ${{ github.event_name != 'pull_request' }} 
-      uses: variar/[email protected]
-      with:
-        verbose: true
-        product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
-        primary-bundle-id: "dev.filimonov.klogg"
-        appstore-connect-username: ${{ inputs.appstore-connect-username }}
-        appstore-connect-password: ${{ inputs.appstore-connect-password }}
+      shell: sh
+      run: |
+        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 }}"
 
-    - name: "Mac staple DMG"
+    - name: Mac staple DMG 
       if: ${{ github.event_name != 'pull_request' }} 
-      uses: devbotsxyz/xcode-staple@v1
-      with:
-        product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
+      shell: sh
+      run: |
+        xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
 
-    - name: "Mac notarize PKG"
+    - name: Mac notarize PKG 
       if: ${{ github.event_name != 'pull_request' }} 
-      uses: variar/[email protected]
-      with:
-        verbose: true
-        product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
-        primary-bundle-id: "dev.filimonov.klogg"
-        appstore-connect-username: ${{ inputs.appstore-connect-username }}
-        appstore-connect-password: ${{ inputs.appstore-connect-password }}
+      shell: sh
+      run: |
+        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 }}"
 
-    - name: "Mac staple PKG"
+    - name: Mac staple PKG 
       if: ${{ github.event_name != 'pull_request' }} 
-      uses: devbotsxyz/xcode-staple@v1
-      with:
-        product-path: "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"         
+      shell: sh 
+      run: |
+        xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
 
     - name: Mac symbols
       shell: sh

diff --git a/.github/actions/klogg-version/action.yml b/.github/actions/klogg-version/action.yml
@@ -6,4 +6,4 @@ runs:
     - name: Set klogg version
       shell: sh
       run: |
-        echo "KLOGG_VERSION=23.08.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV 
+        echo "KLOGG_VERSION=24.11.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV 
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -70,18 +70,6 @@ jobs:
             container: variar/klogg_oracle8
             cmake_opts: -DCMAKE_BUILD_WITH_INSTALL_RPATH=on
 
-          - os: ubuntu_bionic
-            os_version: 18.04
-            arch: x64
-            check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
-            cpack_gen: DEB
-            artifacts_id: bionic
-            package_suffix: deb
-            check_container: ubuntu:18.04
-            container_root: docker/ubuntu18.04
-            container: variar/klogg_ubuntu18.04
-            cmake_opts: -DKLOGG_USE_LTO=OFF
-
           - os: ubuntu_focal
             os_version: 20.04
             arch: x64
@@ -106,16 +94,28 @@ jobs:
             container: variar/klogg_ubuntu22.04
             cmake_opts:
 
+          - os: ubuntu_noble
+            os_version: 24.04
+            arch: x64
+            check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
+            cpack_gen: DEB
+            artifacts_id: noble
+            package_suffix: deb
+            check_container: ubuntu:24.04
+            container_root: docker/ubuntu24.04
+            container: variar/klogg_ubuntu24.04
+            cmake_opts:
+
           - os: ubuntu_appimage
-            os_version: 18.04
+            os_version: 20.04
             arch: x64
             #check_command: apt-get update && apt install --dry-run /usr/local/klogg*.deb
             #cpack_gen: DEB
             artifacts_id: appimage
             package_suffix: AppImage
             #check_container: ubuntu:18.04
-            container_root: docker/ubuntu18.04_qt5.15
-            container: variar/klogg_ubuntu18.04_qt5.15
+            container_root: docker/ubuntu20.04_qt5.15
+            container: variar/klogg_ubuntu20.04_qt5.15
             cmake_opts: -DKLOGG_USE_LTO=OFF -DCMAKE_PREFIX_PATH=/opt/qt515/
 
 
@@ -152,19 +152,12 @@ jobs:
       matrix:
         config:
           - os: macos
-            os_version: 11
-            qt_version: 5.15.2
-            qt_modules:
-            arch: x64
-            artifacts_id: macos-qt5
-            cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.14
-          - os: macos
-            os_version: 11
-            qt_version: 6.5.1
+            os_version: 12
+            qt_version: 6.7.3
             qt_modules: qt5compat
             arch: x64
             artifacts_id: macos-qt6
-            cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=10.15
+            cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=11.7
 
     runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
     steps:
@@ -190,8 +183,9 @@ jobs:
         with:
           p12-file-base64: ${{ secrets.CODESIGN_BASE64 }}
           p12-password: ${{ secrets.CODESIGN_PASSWORD }}
-          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
-          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
+          notarization-username: ${{ secrets.NOTARIZATION_USERNAME }}
+          notarization-team: ${{ secrets.NOTARIZATION_TEAM }}
+          notarization-password: ${{ secrets.NOTARIZATION_PASSWORD }}
 
       - uses: actions/upload-artifact@v3
         with:
@@ -207,15 +201,7 @@ jobs:
         config:
           - os: windows
             os_version: 2022
-            qt_version: 5.15.2
-            arch: x64
-            ssl_arch: -x64
-            cmake_opts:
-            artifacts_id: windows-x64-qt5
-
-          - os: windows
-            os_version: 2022
-            qt_version: 6.5.1
+            qt_version: 6.7.3
             qt_modules: qt5compat
             arch: x64
             ssl_arch: -x64
@@ -239,12 +225,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ github.workspace }}\openssl-1.1
-          key: OpensslCache-1-1-1n
+          key: OpensslCache-1-1-1w
 
       - name: Download openssl
         if: ${{ steps.cache-openssl.outputs.cache-hit != 'true' }} 
         run: |
-          Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1-zip" -OutFile openssl.zip
+          Invoke-WebRequest -Uri "https://www.firedaemon.com/download-firedaemon-openssl-1.1.1-zip" -OutFile openssl.zip
           7z x openssl.zip 
 
       - name: Set openssl paths

diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -50,44 +50,41 @@ jobs:
     - name: Upload symbols linux
       shell: sh
       run: |
-        xz -d ./packages-bionic/klogg_bionic.debug.xz
         xz -d ./packages-focal/klogg_focal.debug.xz
         xz -d ./packages-jammy/klogg_jammy.debug.xz
+        xz -d ./packages-noble/klogg_noble.debug.xz
         xz -d ./packages-oracle/klogg_oracle.debug.xz
         xz -d ./packages-appimage/klogg_appimage.debug.xz
-        sentry-cli upload-dif ./packages-bionic/klogg_bionic.debug  ./packages-bionic/klogg_bionic
         sentry-cli upload-dif ./packages-focal/klogg_focal.debug ./packages-focal/klogg_focal
         sentry-cli upload-dif ./packages-jammy/klogg_jammy.debug ./packages-jammy/klogg_jammy
+        sentry-cli upload-dif ./packages-noble/klogg_noble.debug  ./packages-noble/klogg_noble
         sentry-cli upload-dif ./packages-oracle/klogg_oracle.debug ./packages-oracle/klogg_oracle
         sentry-cli upload-dif ./packages-appimage/klogg_appimage.debug  ./packages-appimage/klogg_appimage
 
     - name: Upload symbols mac
       shell: sh
       run: |
-        sentry-cli upload-dif ./packages-macos-qt5/klogg-Qt5.app/Contents/MacOS/klogg ./packages-macos-qt5/klogg-Qt5.dSym
         sentry-cli upload-dif ./packages-macos-qt6/klogg-Qt6.app/Contents/MacOS/klogg ./packages-macos-qt6/klogg-Qt6.dSym
 
     - name: Upload symbols win
       shell: sh
       run: |
-        sentry-cli upload-dif ./packages-windows-x64-qt5/klogg-$KLOGG_VERSION-x64-Qt5-pdb.zip
         sentry-cli upload-dif ./packages-windows-x86-qt5/klogg-$KLOGG_VERSION-x86-Qt5-pdb.zip 
         sentry-cli upload-dif ./packages-windows-x64-qt6/klogg-$KLOGG_VERSION-x64-Qt6-pdb.zip
 
     - name: Cleanup release artifacts
       shell: sh
       run: |
-        rm -rf ./packages-bionic/klogg_bionic
         rm -rf ./packages-focal/klogg_focal
         rm -rf ./packages-jammy/klogg_jammy
+        rm -rf ./packages-noble/klogg_noble
         rm -rf ./packages-oracle/klogg_oracle
         rm -rf ./packages-appimage/klogg_appimage
-        rm -rf ./packages-macos-qt5/klogg-Qt5.app
         rm -rf ./packages-macos-qt6/klogg-Qt6.app
         mkdir ./linux-debug
-        mv ./packages-bionic/klogg_bionic.debug ./linux-debug
         mv ./packages-focal/klogg_focal.debug ./linux-debug
         mv ./packages-jammy/klogg_jammy.debug ./linux-debug
+        mv ./packages-noble/klogg_noble.debug ./linux-debug
         mv ./packages-oracle/klogg_oracle.debug ./linux-debug
         mv ./packages-appimage/klogg_appimage.debug ./linux-debug
         tar -cJf ./linux-debug/klogg-$KLOGG_VERSION-symbols.tar.xz ./linux-debug/*
@@ -104,7 +101,7 @@ jobs:
     - name: Prepare checksums
       shell: sh
       run: |
-        sha256sum --binary ./packages-bin/* ./packages-bionic/* ./packages-focal/* ./packages-jammy/* ./packages-oracle/* ./packages-appimage/*  > ./packages-bin/klogg-$KLOGG_VERSION-sha256.txt
+        sha256sum --binary ./packages-bin/* ./packages-focal/* ./packages-jammy/* ./packages-noble/* ./packages-oracle/* ./packages-appimage/*  > ./packages-bin/klogg-$KLOGG_VERSION-sha256.txt
         
     - name: Release win
       uses: "marvinpinto/action-automatic-releases@latest"
@@ -113,7 +110,6 @@ jobs:
         automatic_release_tag: continuous-win
         prerelease: true
         files: |
-          ./packages-windows-x64-qt5/*
           ./packages-windows-x86-qt5/*
           ./packages-windows-x64-qt6/*
 
@@ -124,9 +120,9 @@ jobs:
         automatic_release_tag: continuous-linux
         prerelease: true
         files: |
-          ./packages-bionic/*
           ./packages-focal/*
           ./packages-jammy/*
+          ./packages-noble/*
           ./packages-oracle/*
           ./packages-appimage/*
           ./packages-bin/*
@@ -139,7 +135,6 @@ jobs:
         automatic_release_tag: continuous-osx
         prerelease: true
         files: |
-          ./packages-macos-qt5/*
           ./packages-macos-qt6/*
 
     - name: Discord notification