Skip to content

Commit

Permalink
Merge branch 'ArduPilot:master' into master_JRE
Browse files Browse the repository at this point in the history
  • Loading branch information
@jfbblue0922
jfbblue0922 authored Oct 13, 2023
2 parents 0880770 + fcd4152 commit 52f7cc4
Show file tree
Hide file tree
Showing 1,501 changed files with 102,967 additions and 53,958 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cache_cleanup.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
# `actions:write` permission is required to delete caches
# See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/cygwin_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -128,6 +130,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/esp32_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -132,6 +134,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -141,7 +145,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/macos_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -128,6 +130,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/test_ccache.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -112,6 +114,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -121,8 +125,8 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.1.0
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand All @@ -140,5 +144,5 @@ jobs:
run: |
PATH="/usr/lib/ccache:/opt/gcc-arm-none-eabi-${{matrix.gcc}}/bin:$PATH"
Tools/scripts/build_tests/test_ccache.py --boards MatekF405,MatekF405-bdshot --min-cache-pct=75
Tools/scripts/build_tests/test_ccache.py --boards CubeOrange,Durandal --min-cache-pct=75
Tools/scripts/build_tests/test_ccache.py --boards Durandal,Pixhawk6X --min-cache-pct=70
8 changes: 6 additions & 2 deletions .github/workflows/test_chibios.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -120,6 +122,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -129,8 +133,8 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.1.0
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/test_coverage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: ardupilot/ardupilot-dev-${{ matrix.type }}:v0.0.29
image: ardupilot/ardupilot-dev-${{ matrix.type }}:v0.1.0
options: --privileged
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
Expand Down Expand Up @@ -56,14 +56,6 @@ jobs:
- name: setup ccache
run: |
. .github/workflows/ccache.env
- name: Configure CAN
if: ${{ matrix.config == 'sitltest-can'}}
run: |
sudo apt-get update
sudo apt-get -y install can-utils iproute2 linux-modules-extra-$(uname -r)
sudo modprobe vcan
sudo ip link add dev vcan0 type vcan
sudo ip link set up vcan0
- name: test ${{matrix.config}} ${{ matrix.toolchain }}
env:
CI_BUILD_TARGET: ${{matrix.config}}
Expand Down Expand Up @@ -99,7 +91,7 @@ jobs:
finish:
if: always()
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Coveralls Finished
uses: coverallsapp/github-action@master
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/test_dds.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -126,6 +128,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -135,7 +139,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: ardupilot/ardupilot-dev-ros:latest
options: --user 1001
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test_environment.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
push:
paths:
- '.github/workflows/test_environment.yml'
- 'Tools/scripts/environment_install/**'
- 'Tools/environment_install/**'

pull_request:
paths:
- '.github/workflows/test_environment.yml'
- 'Tools/scripts/environment_install/**'
- 'Tools/environment_install/**'


concurrency:
Expand All @@ -20,7 +20,7 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: ${{matrix.os}}:${{matrix.name}}
options: --privileged
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
software-properties-common
;;
*"archlinux"*)
pacman -Sy --noconfirm --needed git sudo
pacman -Syu --noconfirm --needed git sudo
;;
esac
Expand Down Expand Up @@ -115,6 +115,7 @@ jobs:
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
source ~/.bashrc
source $HOME/venv-ardupilot/bin/activate || true
git config --global --add safe.directory /__w/ardupilot/ardupilot
./waf configure
./waf rover
Expand All @@ -128,6 +129,7 @@ jobs:
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
source ~/.bashrc
source $HOME/venv-ardupilot/bin/activate || true
case ${{matrix.os}} in
*"archlinux"*)
export PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin:$PATH
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test_linux_sbc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -121,6 +123,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -130,8 +134,8 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.1.0
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test_replay.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

pull_request:
paths-ignore:
Expand Down Expand Up @@ -134,6 +136,8 @@ on:
# Remove some directories check
- '.vscode/**'
- '.github/ISSUE_TEMPLATE/**'
# Remove change on other workflows
- '.github/workflows/test_environment.yml'

workflow_dispatch:

Expand All @@ -143,8 +147,8 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-${{ matrix.toolchain }}:v0.1.0
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_scripting.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ concurrency:

jobs:
test-scripting:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-base:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-base:v0.1.0
steps:
# git checkout the PR
- uses: actions/checkout@v3
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/test_scripts.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ concurrency:

jobs:
build:
runs-on: ubuntu-20.04
container: ardupilot/ardupilot-dev-base:v0.0.29
runs-on: ubuntu-22.04
container: ardupilot/ardupilot-dev-base:v0.1.0
strategy:
fail-fast: false # don't cancel if a job from the matrix fails
matrix:
Expand All @@ -30,6 +30,4 @@ jobs:
CI_BUILD_TARGET: ${{matrix.config}}
shell: bash
run: |
sudo apt update
sudo apt-get install -y astyle
Tools/scripts/build_ci.sh
Loading

0 comments on commit 52f7cc4

Please sign in to comment.