diff --git a/README.md b/README.md index 4d422a1..b2acce8 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Configuration is done via environment variables. When adding a new option, make ### Sample Applications * `WORKSPACES`: which workspaces should be built. +* `SOURCE_ONLY_WORKSPACES`: workspaces which shouldn't be be built, but the source files will be included in the source upload * `SA_PACKAGE_NAME`: controls which package's manifest file would determine the version of the application bundle that's going to be uploaded to S3. * `UPLOAD_SOURCES`: by default, the source files for `${WORKSPACES}` will be uploaded (along with LICENSE, NOTICE, README and roboMakerSettings.json files). You may override the default behavior. * `UPLOAD_SOURCES=false`: Skip source upload diff --git a/ce_build.sh b/ce_build.sh index 5d5a3de..fcb5437 100755 --- a/ce_build.sh +++ b/ce_build.sh @@ -38,6 +38,7 @@ docker run -v "${PWD}/shared:/shared" \ -e GAZEBO_VERSION="${GAZEBO_VERSION:-7}" \ -e DOCKER_BUILD_SCRIPT="${DOCKER_BUILD_SCRIPT}" \ -e WORKSPACES="${WORKSPACES}" \ + -e SOURCE_ONLY_WORKSPACES="${SOURCE_ONLY_WORKSPACES}" \ -e UPLOAD_SOURCES="${UPLOAD_SOURCES}" \ --name "${ROS_DISTRO}-container" \ --network=host \ diff --git a/common_sa_build.sh b/common_sa_build.sh index e95ed9a..d2eda83 100644 --- a/common_sa_build.sh +++ b/common_sa_build.sh @@ -15,8 +15,10 @@ if [ -z "$WORKSPACES" ]; then WORKSPACES="robot_ws simulation_ws" fi +SOURCE_WORKSPACES="${WORKSPACES} ${SOURCE_ONLY_WORKSPACES}" + # Run ROSWS update in each workspace before creating archive -for WS in $WORKSPACES +for WS in $SOURCE_WORKSPACES do WS_DIR="/${ROS_DISTRO}_ws/src/${BUILD_DIR_NAME}/${WS}" echo "looking for ${WS}, $WS_DIR" @@ -30,7 +32,7 @@ done if [ ! -z "$UPLOAD_SOURCES" ] && [ "$UPLOAD_SOURCES" == "false" ]; then echo "Skipping source upload for this build job" else - SOURCES_INCLUDES="${WORKSPACES} LICENSE* NOTICE* README* roboMakerSettings.json" + SOURCES_INCLUDES="${SOURCE_WORKSPACES} LICENSE* NOTICE* README* roboMakerSettings.json" cd /${ROS_DISTRO}_ws/src/${BUILD_DIR_NAME}/ /usr/bin/zip -r /shared/sources.zip $SOURCES_INCLUDES tar cvzf /shared/sources.tar.gz $SOURCES_INCLUDES