Test

jdpurcell · Apr 28, 2024 · 900b1db · 900b1db
1 parent e72b365
commit 900b1db
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,23 +14,23 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner: 'ubuntu-20.04'
-            qtVersion: '5.15.2'
+          # - runner: 'ubuntu-20.04'
+          #   qtVersion: '5.15.2'
           - runner: 'macos-14'
             qtVersion: '6.5.3'
             qtModules: 'qtimageformats'
-          - runner: 'macos-14'
-            qtVersion: '5.15.2'
-            osSuffix: '_legacy'
-          - runner: 'windows-2022'
-            qtVersion: '6.5.3'
-            qtArch: 'win64_msvc2019_64'
-            osSuffix: '_64'
-            qtModules: 'qtimageformats'
-          - runner: 'windows-2022'
-            qtVersion: '5.15.2'
-            qtArch: 'win32_msvc2019'
-            osSuffix: '_32'
+          # - runner: 'macos-14'
+          #   qtVersion: '5.15.2'
+          #   osSuffix: '_legacy'
+          # - runner: 'windows-2022'
+          #   qtVersion: '6.5.3'
+          #   qtArch: 'win64_msvc2019_64'
+          #   osSuffix: '_64'
+          #   qtModules: 'qtimageformats'
+          # - runner: 'windows-2022'
+          #   qtVersion: '5.15.2'
+          #   qtArch: 'win32_msvc2019'
+          #   osSuffix: '_32'
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set environment variables
@@ -43,7 +43,8 @@ jobs:
             echo "buildNumString=$buildNum" >> $GITHUB_ENV
           fi
 
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
@@ -58,6 +59,9 @@ jobs:
         run: dist/scripts/build.ps1
 
       - name: Deploy qView
+        env:
+          APPLE_DEVID_APP_CERT_DATA: ${{ secrets.APPLE_DEVID_APP_CERT_DATA }}
+          APPLE_DEVID_APP_CERT_PASS: ${{ secrets.APPLE_DEVID_APP_CERT_PASS }}
         shell: pwsh
         run: |
           if ("${{ matrix.skipPlugins }}" -ne "true") {

diff --git a/dist/scripts/macdeploy.sh b/dist/scripts/macdeploy.sh
@@ -1,21 +1,23 @@
 #!/usr/bin/bash
 
 if [ $1 != "" ]; then
-        VERSION=$0
+    VERSION=$0
 else
-        VERSION=$(LC_ALL=C sed -n -e '/^VERSION/p' qView.pro)
-        VERSION=${VERSION: -3}
+    VERSION=$(LC_ALL=C sed -n -e '/^VERSION/p' qView.pro)
+    VERSION=${VERSION: -3}
 fi
 
+CODESIGN_CERT_NAME=-
+
 cd bin
 
 macdeployqt qView.app
 if [ $1 != "" ]; then
-    macdeployqt *.app -codesign=- -dmg
+    macdeployqt *.app -codesign="$CODESIGN_CERT_NAME" -dmg
     mv qView.dmg qView-JDP-$1-macOS$2.dmg
 else
     brew install create-dmg
-    codesign --sign - --deep qView.app
+    codesign --sign "$CODESIGN_CERT_NAME" --deep qView.app
     create-dmg --volname "qView $VERSION" --window-size 660 400 --icon-size 160 --icon "qView.app" 180 170 --hide-extension qView.app --app-drop-link 480 170 "qView-JDP-$VERSION.dmg" "qView.app"
 fi