@@ -45,29 +45,53 @@ jobs:
4545 /usr/bin/security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
4646 /usr/bin/security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k espressif build.keychain
4747
48- echo "codesigning espressif-ide"
48+ echo "codesigning espressif-ide-macosx.cocoa.x86_64 "
4949 /usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/x86_64/Espressif-IDE.app -v
5050 /usr/bin/codesign -v -vvv --deep $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/x86_64/Espressif-IDE.app
51+
52+ echo "codesigning espressif-ide-macosx.cocoa.aarch64"
53+ /usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/aarch64/Espressif-IDE.app -v
54+ /usr/bin/codesign -v -vvv --deep $PWD/releng/com.espressif.idf.product/target/products/com.espressif.idf.product/macosx/cocoa/aarch64/Espressif-IDE.app
5155
52- echo "Creating dmg for Espressif-IDE.app "
56+ echo "Creating dmg for espressif-ide-macosx.cocoa.x86_64 "
5357 $PWD/releng/ide-dmg-builder/ide-dmg-builder.sh
54- /usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE.dmg -v
55- /usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE.dmg
58+ /usr/bin/codesign --entitlements $PWD/releng/com.espressif.idf.product/entitlements/espressif-ide.entitlement --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg -v
59+ /usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
60+
61+ echo "Creating dmg for espressif-ide-macosx.cocoa.aarch64"
62+ $PWD/releng/ide-dmg-builder/ide-dmg-builder-aarch64.sh
63+ /usr/bin/codesign --options runtime --force -s "ESPRESSIF SYSTEMS (SHANGHAI) CO., LTD. (QWXF6GB4AV)" $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg -v
64+ /usr/bin/codesign -v -vvv --deep $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg
5665
57- - name : Notarize Espressif-IDE
66+ - name : Notarize Espressif-IDE-macosx-cocoa-x86_64.dmg
5867 env :
5968 NOTARIZATION_USERNAME : ${{ secrets.NOTARIZATION_USERNAME }}
6069 NOTARIZATION_PASSWORD : ${{ secrets.NOTARIZATION_PASSWORD }}
6170 run : |
62- echo "Notarization of Espressif-IDE.dmg"
63- xcrun altool --notarize-app -f $PWD/releng/ide-dmg-builder/Espressif-IDE.dmg -u $NOTARIZATION_USERNAME -p $NOTARIZATION_PASSWORD --primary-bundle-id Espressif-ide.app
64-
65- - name : Upload macosx dmg
71+ echo "Notarization of Espressif-IDE-macosx-cocoa-x86_64.dmg"
72+ xcrun altool --notarize-app -f $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg -u $NOTARIZATION_USERNAME -p $NOTARIZATION_PASSWORD --primary-bundle-id Espressif-ide.app
73+
74+ - name : Notarize Espressif-IDE-macosx-cocoa-aarch64.dmg
75+ env :
76+ NOTARIZATION_USERNAME : ${{ secrets.NOTARIZATION_USERNAME }}
77+ NOTARIZATION_PASSWORD : ${{ secrets.NOTARIZATION_PASSWORD }}
78+ run : |
79+ echo "Notarization of Espressif-IDE-macosx-cocoa-aarch64.dmg"
80+ xcrun altool --notarize-app -f $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg -u $NOTARIZATION_USERNAME -p $NOTARIZATION_PASSWORD --primary-bundle-id Espressif-ide.app
81+
82+ - name : Upload Espressif-IDE-macosx-cocoa-x86_64.dmg
83+ if : ${{ !cancelled() }}
84+ uses : actions/upload-artifact@v2
85+ with :
86+ name : espressif-ide-macosx-cocoa-x86_64
87+ path : releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg
88+
89+ - name : Upload Espressif-IDE-macosx-cocoa-aarch64.dmg
6690 if : ${{ !cancelled() }}
6791 uses : actions/upload-artifact@v2
6892 with :
69- name : espressif-ide-macosx-dmg
70- path : releng/ide-dmg-builder/Espressif-IDE.dmg
93+ name : espressif-ide-macosx.cocoa.aarch64
94+ path : releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64 .dmg
7195
7296 - name : Upload build artifacts
7397 if : ${{ !cancelled() }}
90114 name : espressif-ide-linux
91115 path : releng/com.espressif.idf.product/target/products/Espressif-IDE-*-linux.gtk.x86_64.tar.gz
92116
117+
93118 - name : Upload build assets to dl.espressif.com
94119 id : upload-release-asset-espressif
95120 env :
@@ -114,12 +139,14 @@ jobs:
114139 ARCHIVE_VERSION_NEW="${ARCHIVE_PREFIX}${ARCHIVE_VERSION}.zip"
115140 echo ${ARCHIVE_VERSION_NEW}
116141 mv ${ARCHIVE_FILE_NAME} ${ARCHIVE_VERSION_NEW}
117- mv releng/ide-dmg-builder/Espressif-IDE.dmg "releng/ide-dmg-builder/Espressif-IDE-${FOLDER_NAME}.dmg"
142+ mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg"
143+ mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg"
118144 aws s3 rm s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest --recursive
119145 aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest
120146 aws s3 cp --acl=public-read "./releng/index.html" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest/
121147 aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/${FOLDER_NAME}
122148 aws s3 cp --acl=public-read --recursive --exclude "*" --include "Espressif-IDE-*" ./releng/com.espressif.idf.product/target/products/ s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
123149 aws s3 cp --acl=public-read "${ARCHIVE_VERSION_NEW}" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/
124- aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
150+ aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
151+ aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
125152 aws cloudfront create-invalidation --distribution-id ${{ secrets.DL_DISTRIBUTION_ID }} --paths "/dl/idf-eclipse-plugin/updates/latest/*"
0 commit comments