Merge pull request #2884 from SasView/osx-signing-debugging

OSX code signing debug
SasView · Jun 18, 2024 · 8e146c5 · 8e146c5
2 parents 905e981 + cf5216b
commit 8e146c5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -242,22 +242,23 @@ jobs:
       - name: Sign executable and create dmg (OSX)
         if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
         env:
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE_ISA }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_ISA_PWD }}
         run: |
           echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
           security create-keychain -p DloaAcYP build.keychain
           security default-keychain -s build.keychain
           security unlock-keychain -p DloaAcYP build.keychain
           security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k DloaAcYP build.keychain
-
+          security find-identity -p codesigning
+          
           cd installers/dist
           python ../../build_tools/fix_qt_folder_names_for_codesign.py SasView6.app
           python  ../../build_tools/code_sign_osx.py
-          codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.app
+          codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: The International Scattering Alliance (8CX8K63BQM)" SasView6.app
           hdiutil create SasView6.dmg -srcfolder SasView6.app -ov -format UDZO
-          codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg
+          codesign -s "Developer ID Application: The International Scattering Alliance (8CX8K63BQM)" SasView6.dmg
 
       - name: Notarize Release Build (OSX)
         if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}

diff --git a/build_tools/code_sign_osx.py b/build_tools/code_sign_osx.py
@@ -34,10 +34,10 @@
 #pyside_libs = pyside_QtWebEngineCore + pyside_QtWebEngineProcess
 
 sign_command = ['codesign', '--timestamp', '--options=runtime', '--verify', '--verbose=4', '--force',
-                '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
+                '--sign',  'Developer ID Application: The International Scattering Alliance (8CX8K63BQM)']
 
 sign_deep_command = ['codesign', '--timestamp', '--deep', '--options=runtime', '--verify', '--verbose=4', '--force',
-                 '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
+                 '--sign',  'Developer ID Application: The International Scattering Alliance (8CX8K63BQM)']
 
 #Signing QtWebEngineProcess.app first as it is a helper app
 for sfile in itertools.chain(pyside_QtWebEngineProcessApp):

diff --git a/build_tools/requirements.txt b/build_tools/requirements.txt
@@ -14,7 +14,7 @@ lxml
 mako
 matplotlib
 numba
-numpy
+numpy==1.26.4
 periodictable
 pybind11
 pylint