forked from iNavFlight/inav
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master'
- Loading branch information
Showing
62 changed files
with
2,852 additions
and
280 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,243 @@ | ||
| 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: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Install dependencies | ||
| run: sudo apt-get update && sudo apt-get -y install ninja-build | ||
| - 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=dev-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) | ||
| VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }') | ||
| echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| - uses: actions/cache@v4 | ||
| with: | ||
| path: downloads | ||
| key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}} | ||
| - name: Build targets (${{ matrix.id }}) | ||
| run: mkdir -p build && cd build && cmake -DWARNINGS_AS_ERRORS=ON -DCI_JOB_INDEX=${{ matrix.id }} -DCI_JOB_COUNT=${{ strategy.job-total }} -DBUILD_SUFFIX=${{ env.BUILD_SUFFIX }} -DVERSION_TYPE=dev -G Ninja .. && ninja ci | ||
| - name: Upload artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ env.BUILD_NAME }}.${{ matrix.id }} | ||
| path: ./build/*.hex | ||
|
|
||
| build-SITL-Linux: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Install dependencies | ||
| run: sudo apt-get update && sudo apt-get -y install ninja-build | ||
| - 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=dev-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) | ||
| VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/[ \t\)]+/, "", $2); print $2 }') | ||
| echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| - name: Build SITL | ||
| run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja -DVERSION_TYPE=dev .. && ninja | ||
| - name: Upload artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: sitl-${{ env.BUILD_NAME }}-Linux | ||
| path: ./build_SITL/*_SITL | ||
|
|
||
| build-SITL-Mac: | ||
| runs-on: macos-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Install dependencies | ||
| run: | | ||
| brew install cmake ninja ruby | ||
| - 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=dev-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) | ||
| VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/[ \t\)]+/, "", $2); print $2 }') | ||
| echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| - name: Build SITL | ||
| run: | | ||
| mkdir -p build_SITL && cd build_SITL | ||
| cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DVERSION_TYPE=dev -G Ninja .. | ||
| ninja | ||
| - name: Upload artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: sitl-${{ env.BUILD_NAME }}-MacOS | ||
| path: ./build_SITL/*_SITL | ||
|
|
||
| build-SITL-Windows: | ||
| runs-on: windows-latest | ||
| defaults: | ||
| run: | ||
| shell: C:\tools\cygwin\bin\bash.exe -o igncr '{0}' | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Setup Cygwin | ||
| uses: egor-tensin/setup-cygwin@v4 | ||
| with: | ||
| packages: cmake ruby ninja gcc-g++ | ||
| - 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=dev-$(date '+%Y%m%d')-$(git rev-parse --short ${COMMIT_ID}) | ||
| VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/[ \t\)]+/, "", $2); print $2 }') | ||
| #echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| #echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV | ||
| #echo "VERSION_TAG=-$(date '+%Y%m%d')" >> $GITHUB_ENV | ||
| echo "version=${VERSION}" >> $GITHUB_OUTPUT | ||
| - name: Build SITL | ||
| run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -DVERSION_TYPE=dev -G Ninja .. && ninja | ||
| - name: Upload artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: sitl-${{ env.BUILD_NAME }}-WIN | ||
| path: ./build_SITL/*.exe | ||
|
|
||
|
|
||
| test: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Install dependencies | ||
| run: sudo apt-get update && sudo apt-get -y install ninja-build | ||
| - name: Run Tests | ||
| run: mkdir -p build && cd build && cmake -DTOOLCHAIN=none -G Ninja .. && ninja check | ||
|
|
||
| release: | ||
| needs: [build, build-SITL-Linux, build-SITL-Mac, build-SITL-Windows, test] | ||
| 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 }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| name: Build firmware | ||
| # 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: | ||
| pull_request: | ||
| paths-ignore: | ||
| - 'src/**' | ||
| - '.github/**' | ||
| - 'cmake/**' | ||
| - 'lib/**' | ||
| - 'docs/Settings.md' | ||
| - 'CMakeLists.txt' | ||
| - '*.sh' | ||
|
|
||
| jobs: | ||
| test: | ||
| #needs: [build] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Install dependencies | ||
| run: sudo apt-get update && sudo apt-get -y install ninja-build | ||
| - name: Run Tests | ||
| run: mkdir -p build && cd build && cmake -DTOOLCHAIN=none -G Ninja .. && ninja check |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.