From 69bb8062823e0fe6b0d604d47ffcd5f0c793e521 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Wed, 22 May 2024 06:26:26 +0200 Subject: [PATCH 1/8] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65ede2d62c..6134164460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -251,7 +251,8 @@ 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 From da104ff1ef3a1693d86fc1f0781748d332264fa7 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Thu, 13 Jun 2024 06:54:47 +0200 Subject: [PATCH 2/8] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6134164460..1bb4ac81d2 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 From 150a7e3cddf990772b80ee2044b192b3c0124f77 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Fri, 14 Jun 2024 14:25:17 +0200 Subject: [PATCH 3/8] Update code_sign_osx.py --- build_tools/code_sign_osx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/code_sign_osx.py b/build_tools/code_sign_osx.py index 7f7d4469ef..0c6882b88a 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', '3rd Party Mac Developer Application: European Spallation Source Eric (W2AG9MPZ43)'] sign_deep_command = ['codesign', '--timestamp', '--deep', '--options=runtime', '--verify', '--verbose=4', '--force', - '--sign', 'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)'] + '--sign', '3rd Party Mac Developer Application: European Spallation Source Eric (W2AG9MPZ43)'] #Signing QtWebEngineProcess.app first as it is a helper app for sfile in itertools.chain(pyside_QtWebEngineProcessApp): From a7388758337dc5aa0297d6a3801a7f00fe9fb251 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Fri, 14 Jun 2024 14:39:55 +0200 Subject: [PATCH 4/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bb4ac81d2..dadeb14d32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -256,7 +256,7 @@ jobs: 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 "3rd Party Mac Developer Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.app hdiutil create SasView6.dmg -srcfolder SasView6.app -ov -format UDZO codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg From 553fa34b40126dde38552b04c6f29829d93d112d Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Fri, 14 Jun 2024 15:05:14 +0200 Subject: [PATCH 5/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dadeb14d32..c7ae4cb7e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -258,7 +258,7 @@ jobs: python ../../build_tools/code_sign_osx.py codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "3rd Party Mac Developer Application: European Spallation Source Eric (W2AG9MPZ43)" 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 "3rd Party Mac Developer Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg - name: Notarize Release Build (OSX) if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }} From c9dbf5cbe3b60b5e2c61ff0e2eff4fe75ae69926 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Tue, 18 Jun 2024 16:20:07 +0200 Subject: [PATCH 6/8] Update requirements.txt --- build_tools/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d5eaaabd61a8d8f7ce292fb731b81a4fc70559a1 Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Tue, 18 Jun 2024 16:40:41 +0200 Subject: [PATCH 7/8] Update code_sign_osx.py --- build_tools/code_sign_osx.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_tools/code_sign_osx.py b/build_tools/code_sign_osx.py index 0c6882b88a..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', '3rd Party Mac Developer 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', '3rd Party Mac Developer 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): From cf5216b03680cf98a6b682100eff4731ebe2864e Mon Sep 17 00:00:00 2001 From: Wojciech Potrzebowski Date: Tue, 18 Jun 2024 16:41:49 +0200 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c7ae4cb7e4..e90d595f3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -256,9 +256,9 @@ jobs: 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 "3rd Party Mac Developer 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 "3rd Party Mac Developer 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') }}