aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: fix arch dev env install

Browse Source
This commit is contained in:
Pierre Kancir 2022-06-30 16:48:15 +02:00 committed by Andrew Tridgell
parent d2abd1eed9
commit 8af5763af3
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/test_environment.yml vendored
View File

@ -92,6 +92,7 @@ jobs:
*"archlinux"*) *"archlinux"*)
cp /etc/skel/.bashrc /root cp /etc/skel/.bashrc /root
cp /etc/skel/.bashrc /github/home cp /etc/skel/.bashrc /github/home
git config --global --add safe.directory /__w/ardupilot/ardupilot
Tools/environment_install/install-prereqs-arch.sh -qy Tools/environment_install/install-prereqs-arch.sh -qy
;; ;;
esac esac
@ -116,6 +117,12 @@ jobs:
shell: 'script -q -e -c "bash {0}"' shell: 'script -q -e -c "bash {0}"'
run: | run: |
source ~/.bashrc source ~/.bashrc
case ${{matrix.os}} in
*"archlinux"*)
export PATH=/opt/gcc-arm-none-eabi-10-2020-q4-major/bin:$PATH
export PATH=/__w/ardupilot/ardupilot/ardupilot/Tools/autotest:$PATH
;;
esac
git config --global --add safe.directory /__w/ardupilot/ardupilot git config --global --add safe.directory /__w/ardupilot/ardupilot
./waf configure --board CubeOrange ./waf configure --board CubeOrange
./waf plane ./waf plane

2
Tools/environment_install/install-prereqs-arch.sh
View File

@ -68,7 +68,7 @@ pip3 -q install --user -U $PYTHON_PKGS
if [ ! -d $OPT/$ARM_ROOT ]; then if [ ! -d $OPT/$ARM_ROOT ]; then
( (
cd $OPT; cd $OPT;
sudo wget $ARM_TARBALL_URL; sudo wget --progress=dot:giga $ARM_TARBALL_URL;
sudo tar xjf ${ARM_TARBALL}; sudo tar xjf ${ARM_TARBALL};
sudo rm ${ARM_TARBALL}; sudo rm ${ARM_TARBALL};
) )