Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Actions: fix tests that don't like repos not called "ardupilot" #27612

Merged
merged 4 commits into from
Jul 30, 2024
Merged

Actions: fix tests that don't like repos not called "ardupilot" #27612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c77b32
Actions: test environment: increase timeout to 60 mins
IamPete1 Jul 22, 2024
68dd16a
Actions: enviroment and scripts: fix safe directory
IamPete1 Jul 22, 2024
de2b4cb
Actions: Cygwin: mark repo as safe on using correct path
IamPete1 Jul 22, 2024
3024cf4
Tools: Scripts: cygwin build: remove setting of git safe directory
IamPete1 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cygwin_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ jobs:
PATH: /usr/bin:$(cygpath ${SYSTEMROOT})/system32
shell: C:\cygwin\bin\bash.exe -eo pipefail '{0}'
run: >-
git config --global --add safe.directory /cygdrive/d/a/${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/}/${GITHUB_REPOSITORY#$GITHUB_REPOSITORY_OWNER/} &&
export PATH=/usr/local/bin:/usr/bin:$(cygpath ${SYSTEMROOT})/system32 &&
source ~/ccache.conf &&
Tools/scripts/cygwin_build.sh &&
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
with:
submodules: 'recursive'
- name: test install environment ${{matrix.os}}.${{matrix.name}}
timeout-minutes: 45
timeout-minutes: 60
env:
DISABLE_MAVNATIVE: True
DEBIAN_FRONTEND: noninteractive
Expand All @@ -103,7 +103,7 @@ jobs:
*"archlinux"*)
cp /etc/skel/.bashrc /root
cp /etc/skel/.bashrc /github/home
git config --global --add safe.directory /__w/ardupilot/ardupilot
git config --global --add safe.directory ${GITHUB_WORKSPACE}
Tools/environment_install/install-prereqs-arch.sh -qy
;;
esac
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test_scripts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ jobs:
CI_BUILD_TARGET: ${{matrix.config}}
shell: bash
run: |
git config --global --add safe.directory ${GITHUB_WORKSPACE}
Tools/scripts/build_ci.sh
2 changes: 0 additions & 2 deletions Tools/scripts/cygwin_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ $GPP_COMPILER -print-sysroot
SYS_ROOT=$($GPP_COMPILER -print-sysroot)
echo "SYS_ROOT=$SYS_ROOT"

git config --global --add safe.directory /cygdrive/d/a/ardupilot/ardupilot

rm -rf artifacts
mkdir artifacts

Expand Down
Loading