Merge pull request #10581 from iNavFlight/build

Simplify build and retry increasing agents

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-          id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]
+          id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/nightly-build.yml

@@ -0,0 +1,97 @@
+name: Build pre-release
+# Don't enable CI on push, just on PR. If you
+# are working on the main repo and want to trigger
+# a CI build submit a draft PR.
+on: 
+  push:
+    branches:
+    - master
+    paths:
+      - 'src/**'
+      - '.github/**'
+      - 'cmake/**'
+      - 'lib/**'
+      - 'docs/Settings.md'
+      - 'CMakeLists.txt'
+      - '*.sh'
+
+jobs:
+  build:
+    name: build
+    uses: ./.github/workflows/ci.yaml
+
+  release:
+    name: Release
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Get version
+        id: version
+        run: |
+          VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/[ \t\)]+/, "", $2); print $2 }')
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+      - name: Get current date
+        id: date
+        run: echo "today=$(date '+%Y%m%d')" >> $GITHUB_OUTPUT
+      - name: download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: hexes
+          pattern: inav-*
+          merge-multiple: true
+      - name: download sitl linux
+        uses: actions/download-artifact@v4
+        with:
+          path: resources/sitl/linux
+          pattern: sitl-*-Linux
+          merge-multiple: true
+      - name: download sitl windows
+        uses: actions/download-artifact@v4
+        with:
+          path: resources/sitl/windows
+          pattern: sitl-*-WIN
+          merge-multiple: true
+      - name: download sitl mac
+        uses: actions/download-artifact@v4
+        with:
+          path: resources/sitl/macos
+          pattern: sitl-*-MacOS
+          merge-multiple: true
+      - name: Consolidate sitl files
+        run: |
+          zip -r -9 sitl-resources.zip resources/
+      - name: Upload release artifacts
+        uses: softprops/action-gh-release@v2
+        with:
+          name: inav-${{ steps.version.outputs.version }}-dev-${{ steps.date.outputs.today }}-${{ github.run_number }}-${{ github.sha }}
+          tag_name: v${{ steps.version.outputs.version }}-${{ steps.date.outputs.today }}.${{ github.run_number }}
+          # To create release on a different repo, we need a token setup
+          token: ${{ secrets.NIGHTLY_TOKEN }}
+          repository: iNavFlight/inav-nightly
+          prerelease: true
+          draft: false
+          #generate_release_notes: true
+          make_latest: false
+          files: |
+            hexes/*.hex
+            sitl-resources.zip
+          body: |
+            ${{ steps.notes.outputs.notes }}
+
+            ### Flashing
+            These are nightly builds and configuration settings can be added and removed often. Flashing with Full chip erase is strongly recommended to avoid issues.
+            Firmware related issues should be opened in the iNavflight/inav repository, not in inav-nightly.
+
+            ### Repository:
+            ${{ github.repository }} ([link](${{ github.event.repository.html_url }}))
+
+            ### Branch:
+            ${{ github.ref_name }} ([link](${{ github.event.repository.html_url }}/tree/${{ github.ref_name }}))
+
+            ### Latest changeset:
+            ${{ github.event.head_commit.id }} ([link](${{ github.event.head_commit.url }}))
+
+            ### Changes:
+            ${{ github.event.head_commit.message }}
+

cmake/ci.cmake

@@ -3,13 +3,20 @@ if(DEFINED CI_JOB_INDEX AND DEFINED CI_JOB_COUNT)
     message("-- configuring CI job ${job_name}/${CI_JOB_COUNT}")
     get_property(targets GLOBAL PROPERTY RELEASE_TARGETS)
     list(LENGTH targets count)
+    message("-- ${count} total targets")
     math(EXPR per_job "(${count}+${CI_JOB_COUNT}-1)/${CI_JOB_COUNT}")
-    message("-- ${per_job} targets per job")
     math(EXPR start "${CI_JOB_INDEX}*${per_job}")
-    list(SUBLIST targets ${start} ${per_job} ci_targets)
-    message("-- will build targets: ${ci_targets}")
-    add_custom_target(ci
-        ${CMAKE_COMMAND} -E true
-        DEPENDS ${ci_targets}
-)
+    message("-- ${per_job} targets per job, starting at ${start}")
+    if(${start} LESS ${count})
+        list(SUBLIST targets ${start} ${per_job} ci_targets)
+        message("-- will build targets: ${ci_targets}")
+        add_custom_target(ci
+            ${CMAKE_COMMAND} -E true
+            DEPENDS ${ci_targets}
+        )
+    else()
+        add_custom_target(ci
+            ${CMAKE_COMMAND} -E true
+        )
+    endif()
 endif()