ci: go back to qt by aqt install

variar · Nov 19, 2024 · 79bc2b9 · 79bc2b9
1 parent 96bb0ac
commit 79bc2b9
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 51 deletions.
diff --git a/.github/actions/agent-package-mac/action.yml b/.github/actions/agent-package-mac/action.yml
@@ -56,65 +56,65 @@ runs:
         cd $KLOGG_BUILD_ROOT
         codesign -v -f -o runtime --deep --timestamp -s "${{ env.KLOGG_CODESIGN }}" ./output/klogg.app;
     
-    # - name: Mac pack dmg
-    #   shell: sh
-    #   run: |
-    #     cd $KLOGG_BUILD_ROOT
-    #     cpack --verbose -G "DragNDrop"
-
-    # - name: Mac codesign dmg
-    #   if: ${{ github.event_name != 'pull_request' }}
-    #   shell: sh
-    #   run: |
-    #     cd $KLOGG_BUILD_ROOT
-    #     mv ./packages/klogg-${{ env.KLOGG_VERSION }}-OSX.dmg ./packages/${{ env.KLOGG_DMG }}
-    #     codesign -v -f -o runtime --timestamp -s "${{ env.KLOGG_CODESIGN }}" ./packages/${{ env.KLOGG_DMG }}
-
-    #- name: Mac notarize DMG 
-    #  if: ${{ github.event_name != 'pull_request' }} 
-    #  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 }}" | tee dmg_notary.log
-    #    dmg_notary_id=$(awk '$1=="id:"{id=$2} END{print id}' dmg_notary.log)
-    #    xcrun notarytool log --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "$dmg_notary_id" "dmg_notary.log.json"
-    #    cat "dmg_notary.log.json"
-#
-    #- name: Mac staple DMG 
-    #  if: ${{ github.event_name != 'pull_request' }} 
-    #  shell: sh
-    #  run: |
-    #    xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
+    - name: Mac pack dmg
+      shell: sh
+      run: |
+        cd $KLOGG_BUILD_ROOT
+        cpack --verbose -G "DragNDrop"
 
-    - name: "Mac build pkg"
+    - name: Mac codesign dmg
       if: ${{ github.event_name != 'pull_request' }}
       shell: sh
       run: |
         cd $KLOGG_BUILD_ROOT
-        mkdir -p packages
-        mkdir -p pkg_resources/en.lproj
-        cp ../COPYING pkg_resources/en.lproj
-        cp ../packaging/description.txt pkg_resources/en.lproj
-        sed -e s/%klogg_version%/${{ env.KLOGG_VERSION }}/ -e s/%klogg_pkg%/klogg-${{ env.KLOGG_VERSION }}-OSX.pkg/ ../packaging/osx/distribution.xml > distribution.xml
-        pkgbuild --component ./output/klogg.app --install-location /Applications --version ${{ env.KLOGG_VERSION }} --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX.pkg
-        productbuild --package-path ./output --distribution distribution.xml --resources ./pkg_resources --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-product.pkg
-        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: Mac notarize PKG 
+        mv ./packages/klogg-${{ env.KLOGG_VERSION }}-OSX.dmg ./packages/${{ env.KLOGG_DMG }}
+        codesign -v -f -o runtime --timestamp -s "${{ env.KLOGG_CODESIGN }}" ./packages/${{ env.KLOGG_DMG }}
+    
+    - name: Mac notarize DMG 
       if: ${{ github.event_name != 'pull_request' }} 
       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 }}" | tee pkg_notary.log
-        pkg_notary_id=$(awk '$1=="id:"{id=$2} END{print id}' pkg_notary.log)
-        xcrun notarytool log --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "$pkg_notary_id" "pkg_notary.log.json"
-        cat "pkg_notary.log.json"
+        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 }}" | tee dmg_notary.log
+        dmg_notary_id=$(awk '$1=="id:"{id=$2} END{print id}' dmg_notary.log)
+        xcrun notarytool log --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "$dmg_notary_id" "dmg_notary.log.json"
+        cat "dmg_notary.log.json"
 
-    - name: Mac staple PKG 
+    - name: Mac staple DMG 
       if: ${{ github.event_name != 'pull_request' }} 
-      shell: sh 
+      shell: sh
       run: |
-        xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
+        xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_DMG }}"
+
+    #- name: "Mac build pkg"
+    #  if: ${{ github.event_name != 'pull_request' }}
+    #  shell: sh
+    #  run: |
+    #    cd $KLOGG_BUILD_ROOT
+    #    mkdir -p packages
+    #    mkdir -p pkg_resources/en.lproj
+    #    cp ../COPYING pkg_resources/en.lproj
+    #    cp ../packaging/description.txt pkg_resources/en.lproj
+    #    sed -e s/%klogg_version%/${{ env.KLOGG_VERSION }}/ -e s/%klogg_pkg%/klogg-${{ env.KLOGG_VERSION }}-OSX.pkg/ ../packaging/osx/distribution.xml > distribution.xml
+    #    pkgbuild --component ./output/klogg.app --install-location /Applications --version ${{ env.KLOGG_VERSION }} --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX.pkg
+    #    productbuild --package-path ./output --distribution distribution.xml --resources ./pkg_resources --sign "${{ env.KLOGG_INSTALLERSIGN }}" --timestamp ./output/klogg-${{ env.KLOGG_VERSION }}-OSX-product.pkg
+    #    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: Mac notarize PKG 
+    #  if: ${{ github.event_name != 'pull_request' }} 
+    #  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 }}" | tee pkg_notary.log
+    #    pkg_notary_id=$(awk '$1=="id:"{id=$2} END{print id}' pkg_notary.log)
+    #    xcrun notarytool log --apple-id "${{ inputs.notarization-username }}" --team-id "${{ inputs.notarization-team }}" --password "${{ inputs.notarization-password }}" "$pkg_notary_id" "pkg_notary.log.json"
+    #    cat "pkg_notary.log.json"
+
+    #- name: Mac staple PKG 
+    #  if: ${{ github.event_name != 'pull_request' }} 
+    #  shell: sh 
+    #  run: |
+    #    xcrun stapler staple "${{ env.KLOGG_BUILD_ROOT }}/packages/${{ env.KLOGG_PKG }}"
 
     - name: Mac symbols
       shell: sh

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -154,12 +154,14 @@ jobs:
           - os: macos
             os_version: 13
             qt_version: 6.7.3
+            qt_arch: clang_64
             arch: x64
             artifacts_id: macos-intel-qt6
             cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=13.0
           - os: macos
             os_version: 14
             qt_version: 6.7.3
+            qt_arch: clang_64
             arch: arm64
             artifacts_id: macos-arm-qt6
             cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=14.0 -DKLOGG_GENERIC_CPU=OFF
@@ -181,9 +183,7 @@ jobs:
 
       - name: Brew deps
         run: |
-          brew install ragel qt6
-          echo "Qt6_Dir=$HOMEBREW_PREFIX/opt/qt@6" >> $GITHUB_ENV
-          echo "Qt6_DIR=$HOMEBREW_PREFIX/opt/qt@6" >> $GITHUB_ENV
+          brew install ragel
 
       - uses: ./.github/actions/agent-setup
       - uses: ./.github/actions/klogg-version