rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
rusefillc 2021-02-05 23:37:35 -05:00
parent e4a85acb3b 094dc77718
commit 38dfe28d7a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/gen-docs.yaml vendored
View File

@ -14,13 +14,13 @@ jobs:
submodules: recursive submodules: recursive
fetch-depth: 0 fetch-depth: 0
- name: Install ncftp, kicad, doxygen, and yq - name: Install ncftp, kicad, doxygen, graphviz, and yq
run: | run: |
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys CC86BB64
sudo add-apt-repository ppa:rmescandon/yq sudo add-apt-repository ppa:rmescandon/yq
sudo add-apt-repository ppa:kicad/kicad-5.1-releases sudo add-apt-repository ppa:kicad/kicad-5.1-releases
sudo apt-get update sudo apt-get update
sudo apt-get install ncftp kicad doxygen yq sudo apt-get install ncftp kicad doxygen graphviz yq
- name: Set FTP variables - name: Set FTP variables
env: env:

2
firmware/Doxyfile
View File

@ -780,7 +780,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = EXCLUDE = ./ChibiOS ./ChibiOS-Contrib ./config/boards/hellen/cypress/OS
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded # directories that are symbolic links (a Unix file system feature) are excluded

4
misc/jenkins/generate_doxygen/gen_upload_docs.sh
View File

@ -20,7 +20,7 @@ doxygen || { echo "doxygen run FAILED"; exit 1; }
cd ../doxygen cd ../doxygen
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading Doxygen" echo "Uploading Doxygen"
ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /html html/ ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /html html/*
fi fi
[ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }
@ -48,6 +48,6 @@ done
if [ -n "$RUSEFI_FTP_SERVER" ]; then if [ -n "$RUSEFI_FTP_SERVER" ]; then
echo "Uploading Pinouts" echo "Uploading Pinouts"
ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /pinouts pinouts/ ncftpput -R -m -u "$RUSEFI_DOXYGEN_FTP_USER" -p "$RUSEFI_DOXYGEN_FTP_PASS" "$RUSEFI_FTP_SERVER" /pinouts pinouts/*
fi fi
[ $? -eq 0 ] || { echo "upload FAILED"; exit 1; } [ $? -eq 0 ] || { echo "upload FAILED"; exit 1; }