Skip to content

Commit 7a24cc1

Browse files
authored
Merge pull request #2066 from mavlink/pr-backport-ci-fixes
[BACKPORT v1.4] CI fixes
2 parents 04ce811 + 05d0233 commit 7a24cc1

File tree

1 file changed

+4
-62
lines changed

1 file changed

+4
-62
lines changed

.github/workflows/main.yml

+4-62
Original file line numberDiff line numberDiff line change
@@ -486,16 +486,15 @@ jobs:
486486
- name: macOS-framework
487487
build-framework: ON
488488
steps:
489-
- uses: actions/checkout@v2
489+
- uses: actions/checkout@v3
490490
with:
491491
submodules: recursive
492+
fetch-depth: 0
492493
- uses: actions/cache@v2
493494
id: cache
494495
with:
495496
path: ./build/macos/third_party/install
496497
key: ${{ github.job }}-${{ matrix.name }}-${{ hashFiles('./third_party/**') }}
497-
- name: fetch git tags for version
498-
run: git fetch --tags
499498
- name: disable superbuild on cache hit
500499
if: steps.cache.outputs.cache-hit == 'true'
501500
run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/macos/third_party/install" >> $GITHUB_ENV
@@ -541,16 +540,15 @@ jobs:
541540
platform: SIMULATOR64
542541
sdk: iphonesimulator
543542
steps:
544-
- uses: actions/checkout@v2
543+
- uses: actions/checkout@v3
545544
with:
546545
submodules: recursive
546+
fetch-depth: 0
547547
- uses: actions/cache@v2
548548
id: cache
549549
with:
550550
path: ./build/${{ matrix.name }}/third_party/install
551551
key: ${{ github.job }}-${{ matrix.name }}-${{ hashFiles('./third_party/**', './tools/ios.toolchain.cmake') }}
552-
- name: fetch git tags for version
553-
run: git fetch --tags
554552
- name: disable superbuild on cache hit
555553
if: steps.cache.outputs.cache-hit == 'true'
556554
run: echo "superbuild=-DSUPERBUILD=OFF" >> $GITHUB_ENV && echo "cmake_prefix_path=-DCMAKE_PREFIX_PATH=$(pwd)/build/${{ matrix.name }}/third_party/install" >> $GITHUB_ENV
@@ -666,59 +664,3 @@ jobs:
666664
asset_name: 'mavsdk_server_win32.exe'
667665
tag: ${{ github.ref }}
668666
overwrite: true
669-
670-
px4-sitl-newer:
671-
name: PX4 SITL ${{ matrix.px4_version }} (ubuntu-20.04)
672-
runs-on: ubuntu-20.04
673-
container: mavsdk/mavsdk-ubuntu-20.04-px4-sitl-${{ matrix.px4_version }}
674-
strategy:
675-
matrix:
676-
px4_version: [v1.11, v1.12]
677-
fail-fast: false
678-
steps:
679-
- uses: actions/checkout@v2
680-
with:
681-
submodules: recursive
682-
- name: git permission workaround
683-
run: |
684-
git config --global --add safe.directory "$GITHUB_WORKSPACE"
685-
git config --global --add safe.directory /github/workspace
686-
- name: install pymavlink dependencies
687-
run: python3 -m pip install future
688-
- name: test
689-
run: PX4_VERSION=${{ matrix.px4_version }} tools/run-sitl-tests.sh /home/user/Firmware
690-
timeout-minutes: 45
691-
- name: look at core files
692-
if: failure()
693-
run: gdb /home/user/Firmware/build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
694-
695-
apm-sitl-newer:
696-
name: APM SITL ${{ matrix.apm_version }} (ubuntu-20.04)
697-
runs-on: ubuntu-20.04
698-
container:
699-
image: mavsdk/mavsdk-ubuntu-20.04-apm-sitl-${{ matrix.apm_version }}
700-
options: --privileged
701-
env:
702-
APM_HOME_LAT: 47.397742
703-
APM_HOME_LONG: 8.545594
704-
APM_HOME_ALT: 488.0
705-
APM_HOME_DIR: 180
706-
WORKDIR: "/home/user/MAVSDK"
707-
FIRMWARE_DIR: /home/user/ArduPilot
708-
strategy:
709-
matrix:
710-
apm_version: [copter-4.1.2]
711-
fail-fast: false
712-
steps:
713-
- uses: actions/checkout@v2
714-
with:
715-
submodules: recursive
716-
- name: git permission workaround
717-
run: |
718-
git config --global --add safe.directory "$GITHUB_WORKSPACE"
719-
git config --global --add safe.directory /github/workspace
720-
- name: install pymavlink dependencies
721-
run: python3 -m pip install future
722-
- name: test
723-
run: APM_VERSION=${{ matrix.apm_version }} tools/run-sitl-tests.sh /home/user/ArduPilot
724-
timeout-minutes: 45

0 commit comments

Comments
 (0)