Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 01:35:35 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/master' into mmosca-gimbal-test

Browse source
This commit is contained in:
Marcelo Bezerra 2024-06-13 15:27:30 +02:00
commit b6ebb96cee
No known key found for this signature in database
GPG key ID: 718A5AC065848530
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/ci.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Setup environment - name: Setup environment
@ -31,22 +31,22 @@ jobs:
VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }') VERSION=$(grep project CMakeLists.txt|awk -F VERSION '{ gsub(/^[ \t]+|[ \t\)]+$/, "", $2); print $2 }')
echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_SUFFIX=${BUILD_SUFFIX}" >> $GITHUB_ENV
echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV echo "BUILD_NAME=inav-${VERSION}-${BUILD_SUFFIX}" >> $GITHUB_ENV
- uses: actions/cache@v1 - uses: actions/cache@v4
with: with:
path: downloads path: downloads
key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}} key: ${{ runner.os }}-downloads-${{ hashFiles('CMakeLists.txt') }}-${{ hashFiles('**/cmake/*')}}
- name: Build targets (${{ matrix.id }}) - 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 }} -DMAIN_COMPILE_OPTIONS=-pipe -G Ninja .. && ninja -j4 ci 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 }} -DMAIN_COMPILE_OPTIONS=-pipe -G Ninja .. && ninja -j4 ci
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.BUILD_NAME }} name: ${{ env.BUILD_NAME }}.${{ matrix.id }}
path: ./build/*.hex path: ./build/*.hex
build-SITL-Linux: build-SITL-Linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Setup environment - name: Setup environment
@ -68,15 +68,15 @@ jobs:
- name: Build SITL - name: Build SITL
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.BUILD_NAME }}_SITL name: ${{ env.BUILD_NAME }}_SITL-Linux
path: ./build_SITL/*_SITL path: ./build_SITL/*_SITL
build-SITL-Mac: build-SITL-Mac:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
brew install cmake ninja ruby brew install cmake ninja ruby
@ -104,7 +104,7 @@ jobs:
ninja -j3 ninja -j3
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.BUILD_NAME }}_SITL-MacOS name: ${{ env.BUILD_NAME }}_SITL-MacOS
path: ./build_SITL/*_SITL path: ./build_SITL/*_SITL
@ -115,7 +115,7 @@ jobs:
run: run:
shell: C:\tools\cygwin\bin\bash.exe -o igncr '{0}' shell: C:\tools\cygwin\bin\bash.exe -o igncr '{0}'
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Setup Cygwin - name: Setup Cygwin
uses: egor-tensin/setup-cygwin@v4 uses: egor-tensin/setup-cygwin@v4
with: with:
@ -139,7 +139,7 @@ jobs:
- name: Build SITL - name: Build SITL
run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4 run: mkdir -p build_SITL && cd build_SITL && cmake -DSITL=ON -DWARNINGS_AS_ERRORS=ON -G Ninja .. && ninja -j4
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: ${{ env.BUILD_NAME }}_SITL-WIN name: ${{ env.BUILD_NAME }}_SITL-WIN
path: ./build_SITL/*.exe path: ./build_SITL/*.exe
@ -149,7 +149,7 @@ jobs:
#needs: [build] #needs: [build]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install ninja-build run: sudo apt-get update && sudo apt-get -y install ninja-build
- name: Run Tests - name: Run Tests

2
.github/workflows/docs.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install python3-yaml run: sudo apt-get update && sudo apt-get -y install python3-yaml
- name: Check that Settings.md is up to date - name: Check that Settings.md is up to date