diff --git a/.github/workflows/main-osx-arm64.yml b/.github/workflows/main-osx-arm64.yml
index 41e65cf9b..92a5e3702 100644
--- a/.github/workflows/main-osx-arm64.yml
+++ b/.github/workflows/main-osx-arm64.yml
@@ -38,11 +38,21 @@ jobs:
npm install --legacy-peer-deps
- name: Build OSX ARM64 packages
+ env:
+ MACOS_CERTIFICATE: ${{ secrets.APPLE_CERT_DATA }}
+ MACOS_CERTIFICATE_PWD: ${{ secrets.APPLE_CERT_PASSWORD }}
+ CODESIGN_ID: ${{ secrets.APPLE_TEAM_ID }}
+ MACOS_KEYCHAIN_PASS: ${{ secrets.LOCAL_KEYCHAIN_PASS }}
run: |
-
+ echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+ security create-keychain -p $MACOS_KEYCHAIN_PASS build.keychain
+ security default-keychain -s build.keychain
+ security unlock-keychain -p $MACOS_KEYCHAIN_PASS 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 $MACOS_KEYCHAIN_PASS build.keychain
npm run buildOSXARM64
ls dist/
-
+
# Loading vars from icestudio package.json
- id: icestudio_json
run: |
@@ -54,24 +64,21 @@ jobs:
run: |
content=`tr '\n' ' ' < app/buildinfo.json`
echo "buildJson=${content}" >> $GITHUB_OUTPUT
-
-
- - name: 'Upload DMG/OSX64'
+
+ - name: Sign DMG
env:
ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
- uses: actions/upload-artifact@v3
- with:
- name: "osxarm64_DMG_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
- path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg"
- if-no-files-found: error
-
- - name: 'Upload ZIP/OSX64'
+ MACOS_APPLE_UID: ${{ secrets.APPLE_TEAM_ID }}
+ run: |
+ codesign --force --deep --sign ${MACOS_APPLE_UID} dist/icestudio-${ICESTUDIO_VERSION}${TIMESTAMP}-osxarm64.dmg -v
+
+ - name: 'Upload DMG/OSX64'
env:
ICESTUDIO_VERSION: "${{fromJson(steps.icestudio_json.outputs.packageJson).version}}"
TIMESTAMP: "${{fromJson(steps.build_date.outputs.buildJson).ts}}"
uses: actions/upload-artifact@v3
with:
- name: "osxarm64_ZIP_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
- path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.zip"
+ name: "osxarm64_DMG_${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}"
+ path: "dist/icestudio-${{env.ICESTUDIO_VERSION}}${{env.TIMESTAMP}}-osxarm64.dmg"
if-no-files-found: error
diff --git a/app/resources/plugins/serial-term/index.html b/app/resources/plugins/serial-term/index.html
index 8727c65df..4cd2d2dc1 100644
--- a/app/resources/plugins/serial-term/index.html
+++ b/app/resources/plugins/serial-term/index.html
@@ -81,6 +81,15 @@
+
+
+
+
+
+
+
+
+
@@ -347,4 +356,4 @@
-