diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a96387a014..fd01975630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -242,8 +242,8 @@ 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 @@ -251,13 +251,14 @@ jobs: 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 index 7f7d4469ef..0e937d90fd 100644 --- 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 index 890c41c0a2..42b08fa984 100644 --- 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