Merge branch 'main' of https://github.com/neochaos42/arduino-ide

Author: {your_name}

.github/workflows/build.yml.rej

@@ -0,0 +1,51 @@
+--- .github/workflows/build.yml
++++ .github/workflows/build.yml
+@@ -67,17 +67,18 @@ jobs:
+     strategy:
+       matrix:
+         config:
+-          - os: windows-2019
+-            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
+-            certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
+-            certificate-extension: pfx # File extension for the certificate.
+-          - os: ubuntu-20.04
+-          - os: macos-latest
+-            # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
+-            # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
+-            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
+-            certificate-password-secret: KEYCHAIN_PASSWORD
+-            certificate-extension: p12
++#          - os: windows-2019
++#            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
++#            certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
++#            certificate-extension: pfx # File extension for the certificate.
++#          - os: ubuntu-20.04
++#          - os: macos-latest
++#            # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
++#            # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
++#            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
++#            certificate-password-secret: KEYCHAIN_PASSWORD
++#            certificate-extension: p12
++          - os: self-hosted
+     runs-on: ${{ matrix.config.os }}
+     timeout-minutes: 90
+ 
+@@ -93,6 +94,7 @@ jobs:
+           cache: 'yarn'
+ 
+       - name: Install Python 3.x
++        if: matrix.config.os != 'self-hosted'
+         uses: actions/setup-python@v4
+         with:
+           python-version: '3.x'
+@@ -166,6 +168,10 @@ jobs:
+             name: Linux_X86-64_zip
+           - path: '*Linux_64bit.AppImage'
+             name: Linux_X86-64_app_image
++          - path: '*Linux_arm64.zip'
++            name: Linux_arm64_zip
++          - path: '*Linux_arm64.AppImage'
++            name: Linux_arm64_app_image
+           - path: '*macOS_64bit.dmg'
+             name: macOS_dmg
+           - path: '*macOS_64bit.zip'

.github/workflows/buildarm.yml

@@ -63,6 +63,7 @@ jobs:
   build:
     name: build (${{ matrix.config.name }})
     needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
     env:
       BUILD_ARTIFACTS_PATH: electron-app/dist/build-artifacts
     strategy:
@@ -82,17 +83,21 @@ jobs:
     runs-on: ${{ matrix.config.runs-on }}
     container: ${{ fromJSON(matrix.config.container) }}
     steps:
-      - name: Checkout
+      - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Install System Dependencies
+      - name: Install Dependencies
         run: |
           sudo apt-get update
+<<<<<<< HEAD
           sudo apt-get install -y chromium-browser python3-distutils build-essential libssl-dev make gcc g++
 
       - name: Configure Python for node-gyp
         run: |
           sudo npm config set python $(which python3)
+=======
+          sudo apt-get install -y chromium-browser python3-distutils python3-pip build-essential libssl-dev
+>>>>>>> fd5854b13d82956104126877874b00c7b1e3be2b
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -120,22 +125,28 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           version: 3.x
 
-      - name: Set Chromium executable path for Puppeteer
+      - name: Set Chromium Executable Path for Puppeteer
         run: |
           echo "PUPPETEER_EXECUTABLE_PATH=$(which chromium-browser)" >> $GITHUB_ENV
 
-      - name: Install Dependencies & Build
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install Project Dependencies
         run: |
           export PUPPETEER_SKIP_DOWNLOAD=true
-          yarn install --check-files
+          yarn install --frozen-lockfile --check-files
+
+      - name: Fix Potential Node-Gyp Issues
+        run: |
+          npm rebuild node-gyp
+          yarn rebuild
+
+      - name: Build Project
+        run: |
           yarn --cwd arduino-ide-extension build
           yarn --cwd electron-app rebuild
           yarn --cwd electron-app build
           yarn --cwd electron-app package
 
-      - name: Upload builds to job transfer artifact
+      - name: Upload Builds to Job Transfer Artifact
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}${{ matrix.config.job-transfer-artifact-suffix }}