From 344fa1716aa3afc4671a2d02ed912630e3113afc Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 20 Jul 2022 08:41:12 -0700 Subject: [PATCH] Upload docs to an s3 bucket based only on the major version (#281) * Upload docs to an s3 bucket based only on the major version Signed-off-by: Nate Koenig * Update API url Signed-off-by: Nate Koenig Co-authored-by: Nate Koenig --- cmake/ignition-config.cmake.in | 2 +- cmake/upload_doc.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/ignition-config.cmake.in b/cmake/ignition-config.cmake.in index 3d4bccd0..95867c30 100644 --- a/cmake/ignition-config.cmake.in +++ b/cmake/ignition-config.cmake.in @@ -176,4 +176,4 @@ endforeach() set(@PROJECT_NAME_NO_VERSION_UPPER@_DOXYGEN_TAGFILE "${PACKAGE_PREFIX_DIR}/@IGN_DATA_INSTALL_DIR@/@PROJECT_NAME_LOWER@.tag.xml") # Specify the API url. This is where the doxygen tag file will resolve URLS to. -set(@PROJECT_NAME_NO_VERSION_UPPER@_API_URL "https://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@") +set(@PROJECT_NAME_NO_VERSION_UPPER@_API_URL "https://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@") diff --git a/cmake/upload_doc.sh.in b/cmake/upload_doc.sh.in index d224c28d..76fabcd7 100644 --- a/cmake/upload_doc.sh.in +++ b/cmake/upload_doc.sh.in @@ -20,7 +20,7 @@ if [ ! -f "@CMAKE_BINARY_DIR@/doxygen/html/index.html" ]; then fi # Dry run -aws s3 sync --dryrun @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@/ +aws s3 sync --dryrun @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@/ if [ -z "$1" ]; then echo -n "Upload (Y/n)? " @@ -32,7 +32,7 @@ fi if [ "$ans" = "n" ] || [ "$ans" = "N" ]; then exit 1 else - aws s3 sync @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@/ + aws s3 sync @CMAKE_BINARY_DIR@/doxygen/html/ s3://gazebosim.org/api/@IGN_DESIGNATION@/@PROJECT_VERSION_MAJOR@/ echo "WARNING" echo " A CloudFront invalidation is required. Run the following command with the appropriate \$CLOUDFRONT_DISTRIBUTION_ID:\n"