Merge branch 'develop' into Italian

FPGAwars · May 22, 2024 · 3503d8c · 3503d8c
2 parents fd18453 + 8def575
commit 3503d8c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git 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
@@ -81,6 +81,15 @@
                 <option value="115200" selected>115200</option>
                 <option value="460800">460800</option>
                 <option value="921600">921600</option>
+                <option value="1000000">1Mbps</option>
+                <option value="1000000">1Mbps</option>
+                <option value="1200000">1.2Mbps</option>
+                <option value="1500000">1.5Mbps</option>
+                <option value="200000">2Mbps</option>
+                <option value="300000">3Mbps</option>
+                <option value="9000000">9Mbps</option>
+                <option value="12000000">12Mbps</option>
+                <option value="24000000">24Mbps</option>
                 <option value="-1">Custom</option>
               </select>
 
@@ -347,4 +356,4 @@
   <script src="js/main.js"></script>
 </body>
 
-</html>
+</html>