Merge branch 'iNavFlight:master' into readmeUpdate

iNavFlight · Jul 2, 2024 · 1d49706 · 1d49706
2 parents 05dde12 + 10a7a40
commit 1d49706
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 751 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
             - name: Install dependencies
               run: sudo apt-get update && sudo apt-get -y install dpkg fakeroot rpm build-essential libudev-dev
             - name: Install deps
-              uses: nick-fields/retry@v2
+              uses: nick-fields/retry@v3
               with:
                 max_attempts: 3
                 retry_on: error
@@ -66,6 +66,56 @@ jobs:
               with:
                 name: ${{ env.BUILD_NAME }}_ZIP
                 path: ./out/make/zip/linux/x64/*.zip
+
+
+    build-mac-arm64:
+        runs-on: macos-13
+        steps:
+        - uses: actions/checkout@v4
+        - name: Setup environment
+          env:
+            ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+          run: |
+            # This is the hash of the commit for the PR
+            # when the action is triggered by PR, empty otherwise
+            COMMIT_ID=${{ github.event.pull_request.head.sha }}
+            # This is the hash of the commit when triggered by push
+            # but the hash of refs/pull/<n>/merge, which is different
+            # from the hash of the latest commit in the PR, that's
+            # why we try github.event.pull_request.head.sha first
+            COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
+            BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
+            VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g')
+            echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
+            echo "BUILD_NAMEarm64=inav-configurator_darwin_arm64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
+        - uses: actions/setup-node@v4
+          with:
+            node-version: 20
+            check-latest: true
+            cache: 'npm'
+        # Workaround due to a bug in node-gyp: https://github.com/electron/rebuild/issues/1116
+        - name: Install Setuptools
+          run: python3 -m pip install --break-system-packages setuptools
+        - name: Install deps
+          uses: nick-fields/retry@v3
+          with:
+            max_attempts: 3
+            retry_on: error
+            command: npm install
+            timeout_minutes: 10
+        - name: Build MacOS arm64
+          run: npm run make -- --arch="arm64"
+        - name: Upload MacOS arm64 zip
+          uses: actions/upload-artifact@v4
+          with:
+            name: ${{env.BUILD_NAMEarm64}}_ZIP
+            path: ./out/make/zip/darwin/arm64/*.zip
+        - name: Upload MacOS arm64 dmg
+          uses: actions/upload-artifact@v4
+          with:
+            name: ${{env.BUILD_NAMEarm64}}_DMG
+            path: ./out/make/*arm64*.dmg
+
     build-mac:
         runs-on: macos-13
         steps:
@@ -86,7 +136,6 @@ jobs:
             VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g')
             echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
             echo "BUILD_NAMEx64=inav-configurator_darwin_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
-            echo "BUILD_NAMEarm64=inav-configurator_darwin_arm64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
         - uses: actions/setup-node@v4
           with:
             node-version: 20
@@ -96,16 +145,14 @@ jobs:
         - name: Install Setuptools
           run: python3 -m pip install --break-system-packages setuptools
         - name: Install deps
-          uses: nick-fields/retry@v2
+          uses: nick-fields/retry@v3
           with:
             max_attempts: 3
             retry_on: error
             command: npm install
             timeout_minutes: 10
         - name: Build MacOS x64
           run: npm run make -- --arch="x64"
-        - name: Build MacOS arm64
-          run: npm run make -- --arch="arm64"
         - name: Upload MacOS x64 zip
           uses: actions/upload-artifact@v4
           with:
@@ -116,16 +163,7 @@ jobs:
           with:
             name: ${{env.BUILD_NAMEx64}}_DMG
             path: ./out/make/*x64*.dmg
-        - name: Upload MacOS arm64 zip
-          uses: actions/upload-artifact@v4
-          with:
-            name: ${{env.BUILD_NAMEarm64}}_ZIP
-            path: ./out/make/zip/darwin/arm64/*.zip
-        - name: Upload MacOS arm64 dmg
-          uses: actions/upload-artifact@v4
-          with:
-            name: ${{env.BUILD_NAMEarm64}}_DMG
-            path: ./out/make/*arm64*.dmg
+
     build-windows:
         runs-on: windows-latest
         steps:
@@ -149,7 +187,6 @@ jobs:
                 echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV
                 echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
                 echo "BUILD_NAMEx64=inav-configurator_win32_x64_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
-                echo "BUILD_NAMEia32=inav-configurator_win32_ia32_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
               shell: bash
             - uses: actions/setup-node@v4
               with:
@@ -161,16 +198,14 @@ jobs:
                 url: "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"
                 pathInArchive: "/"
             - name: Install deps
-              uses: nick-fields/retry@v2
+              uses: nick-fields/retry@v3
               with:
                 max_attempts: 3
                 retry_on: error
                 command: npm install
                 timeout_minutes: 10
-            - name: Build Win32 x64
+            - name: Build Win x64
               run: npm run make -- --arch="x64"
-            - name: Build win32 ia32
-              run: npm run make -- --arch="ia32"
             - name: Upload Windows x64 zip
               uses: actions/upload-artifact@v4
               with:
@@ -181,6 +216,49 @@ jobs:
               with:
                 name: ${{env.BUILD_NAMEx64}}_MSI
                 path: ./out/make/wix/x64/*.msi
+
+    build-windows-win32:
+        runs-on: windows-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Install linux utils
+              run: choco install --force -y awk grep sed
+            - name: Setup environment
+              env:
+                ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+              run: |
+                # This is the hash of the commit for the PR
+                # when the action is triggered by PR, empty otherwise
+                COMMIT_ID=${{ github.event.pull_request.head.sha }}
+                # This is the hash of the commit when triggered by push
+                # but the hash of refs/pull/<n>/merge, which is different
+                # from the hash of the latest commit in the PR, that's
+                # why we try github.event.pull_request.head.sha first
+                COMMIT_ID=${COMMIT_ID:-${{ github.sha }}}
+                BUILD_SUFFIX=ci-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID})
+                VERSION=$(grep version package.json | sed 's/.*"\([0-9][0-9]*.[0-9]*.[0-9]*\)".*/\1/g')
+                echo "ACTIONS_STEP_DEBUG=true" >> $GITHUB_ENV
+                echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
+                echo "BUILD_NAMEia32=inav-configurator_win32_ia32_${VERSION}_${BUILD_SUFFIX}" >> $GITHUB_ENV
+              shell: bash
+            - uses: actions/setup-node@v4
+              with:
+                node-version: 20
+                cache: 'npm'
+            - uses: engineerd/[email protected]
+              with: 
+                name: "Wix Toolset 3.1.4"
+                url: "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"
+                pathInArchive: "/"
+            - name: Install deps
+              uses: nick-fields/retry@v3
+              with:
+                max_attempts: 3
+                retry_on: error
+                command: npm install
+                timeout_minutes: 10
+            - name: Build Win32
+              run: npm run make -- --arch="ia32"
             - name: Upload Windows ia32 zip
               uses: actions/upload-artifact@v4
               with:
@@ -191,4 +269,4 @@ jobs:
               with:
                 name: ${{env.BUILD_NAMEia32}}_MSI
                 path: ./out/make/wix/ia32/*.msi
-        
+