ci: try use same xcode version for 13 and 14 builds

variar · Nov 18, 2024 · a441c47 · a441c47
1 parent d9f85eb
commit a441c47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/agent-package-mac/action.yml b/.github/actions/agent-package-mac/action.yml
@@ -46,8 +46,8 @@ runs:
       run: |
         echo "KLOGG_CODESIGN=Developer ID Application: Anton Filimonov (GAW773U324)" >> $GITHUB_ENV
         echo "KLOGG_INSTALLERSIGN=Developer ID Installer: Anton Filimonov (GAW773U324)" >> $GITHUB_ENV
-        echo "KLOGG_DMG=klogg-${{ env.KLOGG_VERSION }}-OSX-${{ env.KLOGG_QT }}.dmg" >> $GITHUB_ENV
-        echo "KLOGG_PKG=klogg-${{ env.KLOGG_VERSION }}-OSX-${{ env.KLOGG_QT }}.pkg" >> $GITHUB_ENV
+        echo "KLOGG_DMG=klogg-${{ env.KLOGG_VERSION }}-mac-${{ env.KLOGG_ARCH }}.dmg" >> $GITHUB_ENV
+        echo "KLOGG_PKG=klogg-${{ env.KLOGG_VERSION }}-mac-${{ env.KLOGG_ARCH }}.pkg" >> $GITHUB_ENV
 
     - name: Mac codesign binaries
       if: ${{ github.event_name != 'pull_request' }}
@@ -85,10 +85,6 @@ runs:
         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_15.2.app
-
     - name: Mac notarize DMG 
       if: ${{ github.event_name != 'pull_request' }} 
       shell: sh
@@ -117,5 +113,5 @@ runs:
       shell: sh
       run: |
         cd $KLOGG_BUILD_ROOT
-        cp -a ./output/klogg.dSym ./packages/klogg-${{ env.KLOGG_QT }}.dSym
-        cp -a ./output/klogg.app ./packages/klogg-${{ env.KLOGG_QT }}.app
+        cp -a ./output/klogg.dSym ./packages/klogg-${{ env.KLOGG_ARCH }}.dSym
+        cp -a ./output/klogg.app ./packages/klogg-${{ env.KLOGG_ARCH }}.app
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -167,7 +167,11 @@ jobs:
     runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
     steps:
       - uses: actions/checkout@v3
-
+
+      - name: Setup Xcode
+        shell: sh
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app
+
 #Install build deps
       - name: Set brew env
         run: |