Skip to content

Commit

Permalink
more debug
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewSazonov committed Jun 19, 2024
1 parent 2474733 commit 0cc4062
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 9 deletions.
15 changes: 15 additions & 0 deletions .github/workflows/installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@ jobs:
with:
python-version: 3.11


- name: Sign offline app installer AAA
run: python -m pip install toml
- name: Sign offline app installer BBB
if: github.event_name == 'push'
run: >
python tools/Scripts/SignAppInstaller.py
fix-signing-macos ${{ matrix.os }}
${{ secrets.MACOS_CERTIFICATE_ENCODED }} ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
${{ secrets.APPSTORE_NOTARIZATION_USERNAME }} ${{ secrets.APPSTORE_NOTARIZATION_PASSWORD }}
- name: Upgrade package installer for Python
run: python -m pip install --upgrade pip

Expand Down Expand Up @@ -68,6 +80,9 @@ jobs:
echo "PYTHON_PACKAGES_PATH=$(python utils.py --get ci.cache.python_packages_path)" >> $GITHUB_ENV
echo "GIT_INSTALL_URL=git+$GITHUB_SERVER_URL/$GITHUB_REPOSITORY@${{ env.BRANCH_NAME }}" >> $GITHUB_ENV
- name: Create python resources file
run: pyside6-rcc ${{ env.PACKAGE_PATH }}/resources.qrc -o ${{ env.PACKAGE_PATH }}/resources.py

Expand Down
24 changes: 15 additions & 9 deletions tools/Scripts/SignAppInstaller.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@

CONFIG = Config.Config(sys.argv[1], sys.argv[2])

MACOS_CERTIFICATE_ENCODED = sys.argv[3] # Encoded content of the .p12 certificate file (exported from certificate of Developer ID Application type)
MACOS_CERTIFICATE_PASSWORD = sys.argv[4] # Password associated with the .p12 certificate
APPSTORE_NOTARIZATION_USERNAME = sys.argv[5] # Apple ID (esss.se personal account) added to https://developer.apple.com
APPSTORE_NOTARIZATION_PASSWORD = sys.argv[6] # App specific password for EasyDiffraction from https://appleid.apple.com

IDENTITY = CONFIG['ci']['codesign']['apple']['identity']
BUNDLE_ID = CONFIG['ci']['codesign']['bundle_id']
TEAM_ID = CONFIG['ci']['codesign']['apple']['team_id']
MACOS_CERTIFICATE_ENCODED = sys.argv[3] # Encoded content of the certificate.p12 file
MACOS_CERTIFICATE_PASSWORD = sys.argv[4] # Password associated with the certificate.p12 file
APPSTORE_NOTARIZATION_USERNAME = sys.argv[5] # Apple ID (esss.se personal account) added to https://developer.apple.com
APPSTORE_NOTARIZATION_PASSWORD = sys.argv[6] # App specific password for EasyDiffraction from https://appleid.apple.com

print('IDENTITY', IDENTITY)
print('BUNDLE_ID', BUNDLE_ID)
print('TEAM_ID', TEAM_ID)
exit()

def signLinux():
Functions.printNeutralMessage('No code signing needed for linux')
Functions.printNeutralMessage('Code signing on Linux is not supported yet')
return

def signWindows():
Expand Down Expand Up @@ -143,8 +149,8 @@ def signMacos():
sub_message = f'display information about the code at "{CONFIG.setup_exe_path}" before signing'
Functions.run(
'codesign',
'--display', # nested code content such as helpers, frameworks, and plug-ins, should be recursively signed
'--verbose', # replace any existing signature on the path(s) given
'--display',
'--verbose',
CONFIG.setup_exe_path)
except Exception as sub_exception:
Functions.printFailMessage(sub_message, sub_exception)
Expand Down Expand Up @@ -174,8 +180,8 @@ def signMacos():
sub_message = f'display information about the code at "{CONFIG.setup_exe_path}" after signing'
Functions.run(
'codesign',
'--display', # nested code content such as helpers, frameworks, and plug-ins, should be recursively signed
'--verbose', # replace any existing signature on the path(s) given
'--display',
'--verbose',
CONFIG.setup_exe_path)
except Exception as sub_exception:
Functions.printFailMessage(sub_message, sub_exception)
Expand Down

0 comments on commit 0cc4062

Please sign in to comment.