From 8c9affddc8159a82f13f99608855b7c82bd9b3a3 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 6 Apr 2017 16:06:11 -0400 Subject: [PATCH] travis-ci generate and upload parameters.md --- .gitignore | 2 ++ .travis.yml | 10 ++++++++++ Makefile | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/.gitignore b/.gitignore index ebfcf22cce..66ba90e87b 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,5 @@ coverage-html/ coverage.info posix-configs/SITL/init/test/*_generated + +parameters.md diff --git a/.travis.yml b/.travis.yml index 65d46e689d..2e7b45eb54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,11 @@ matrix: services: - docker env: BUILD_TARGET=clang-tidy + - os: linux + sudo: required + services: + - docker + env: BUILD_TARGET=parameters_markdown - os: osx sudo: true osx_image: xcode8 @@ -59,6 +64,8 @@ script: ./Tools/docker_run.sh 'make tests'; elif [[ "${BUILD_TARGET}" = "clang-tidy" && "${TRAVIS_BRANCH}" != "coverity" ]]; then PX4_DOCKER_REPO=px4io/px4-dev-clang ./Tools/docker_run.sh 'make clang-tidy-parallel'; + elif [[ "${BUILD_TARGET}" = "parameters_markdown" && "${TRAVIS_BRANCH}" != "coverity" ]]; then + PX4_DOCKER_REPO=px4io/px4-dev-base ./Tools/docker_run.sh 'make parameters_markdown'; elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then make tests; fi @@ -69,6 +76,9 @@ after_success: ./Tools/docker_run.sh 'make s3put_firmware AWS_S3_BUCKET="px4-travis/archives/Firmware/${TRAVIS_BRANCH}/${TRAVIS_BUILD_ID}"' && ./Tools/docker_run.sh 'make s3put_qgc_firmware AWS_S3_BUCKET="px4-travis/Firmware/${TRAVIS_BRANCH}"'; fi + - if [[ "${BUILD_TARGET}" = "parameters_markdown" && "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" != "coverity" ]]; then + ./Tools/docker_run.sh 'make s3put_parameters_markdown AWS_S3_BUCKET="px4-travis/Firmware/${TRAVIS_BRANCH}"'; + fi deploy: # on tags deploy Firmware.zip to Github releases diff --git a/Makefile b/Makefile index ebf7c1c08c..bf8d2fb93b 100644 --- a/Makefile +++ b/Makefile @@ -221,6 +221,13 @@ check_%: @$(MAKE) --no-print-directory $(subst check_,,$@) @echo +# Documentation +# -------------------------------------------------------------------- +.PHONY: parameters_markdown + +parameters_markdown: posix_sitl_default + @python $(SRC_DIR)/Tools/px_process_params.py -s $(SRC_DIR)/src --markdown + # S3 upload helpers # -------------------------------------------------------------------- # s3cmd uses these ENV variables @@ -241,6 +248,9 @@ s3put_qgc_firmware: qgc_firmware @$(SRC_DIR)/Tools/s3put.sh $(SRC_DIR)/build_px4fmu-v3_default/parameters.xml @find $(SRC_DIR)/build_* -name "*.px4" -exec $(SRC_DIR)/Tools/s3put.sh "{}" \; +s3put_parameters_markdown: parameters_markdown + @$(SRC_DIR)/Tools/s3put.sh parameters.md + # Astyle # -------------------------------------------------------------------- .PHONY: check_format format