Saving AdditionalMaps in nightly build

Author: bernatx

Docs/build_update.md

@@ -69,9 +69,25 @@ Releases are listed in __Development__ in the CARLA repository. There is also a
 </p>
 
 <p>
-<a href="http://carla-releases.s3.amazonaws.com/Linux/Dev/CARLA_Latest.tar.gz" target="_blank" class="btn btn-neutral" title="Go to the nightly CARLA build">
-<span class="icon fa-cloud-download"></span> Get the nightly build</a>
+<a href="http://carla-releases.s3.amazonaws.com/Linux/Dev/CARLA_Latest.tar.gz" target="_blank" class="btn btn-neutral" title="Go to the linux nightly CARLA build">
+<span class="icon fa-cloud-download"></span> Get the linux nightly build</a>
 </p>
+
+<p>
+<a href="http://carla-releases.s3.amazonaws.com/Linux/Dev/AdditionalMaps_Latest.tar.gz" target="_blank" class="btn btn-neutral" title="Go to the linux nightly AdditionalMaps build">
+<span class="icon fa-cloud-download"></span> Get the linux nightly build additional maps</a>
+</p>
+
+<p>
+<a href="http://carla-releases.s3.amazonaws.com/Windows/Dev/CARLA_Latest.zip" target="_blank" class="btn btn-neutral" title="Go to the windows nightly CARLA build">
+<span class="icon fa-cloud-download"></span> Get the windows nightly build</a>
+</p>
+
+<p>
+<a href="http://carla-releases.s3.amazonaws.com/Windows/Dev/AdditionalMaps_Latest.zip" target="_blank" class="btn btn-neutral" title="Go to the windows nightly AdditionalMaps build">
+<span class="icon fa-cloud-download"></span> Get the windows nightly build additional maps</a>
+</p>
+
 </div>
 
 ---

Docs/download.md

@@ -11,7 +11,9 @@
 > next release, but also some experimental changes. Use at your own risk!
 
 - [CARLA Nightly Build (Linux)](https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/Dev/CARLA_Latest.tar.gz)  
+- [AdditionalMaps Nightly Build (Linux)](https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/Dev/AdditionalMaps_Latest.tar.gz)  
 - [CARLA Nightly Build (Windows)](https://carla-releases.s3.eu-west-3.amazonaws.com/Windows/Dev/CARLA_Latest.zip)  
+- [AdditionalMaps Nightly Build (Windows)](https://carla-releases.s3.eu-west-3.amazonaws.com/Windows/Dev/AdditionalMaps_Latest.zip)  
 
 ### Versions 0.9.x
 

README.md

@@ -21,7 +21,13 @@ If you want to benchmark your model in the same conditions as in our CoRL’17
 paper, check out
 [Benchmarking](https://github.com/carla-simulator/driving-benchmarks).
 
+Linux:
 * [**Get CARLA overnight build**](http://carla-releases.s3.amazonaws.com/Linux/Dev/CARLA_Latest.tar.gz)
+* [**Get AdditionalMaps overnight build**](http://carla-releases.s3.amazonaws.com/Linux/Dev/AdditionalMaps_Latest.tar.gz)
+
+Windows:
+* [**Get CARLA overnight build**](http://carla-releases.s3.amazonaws.com/Windows/Dev/CARLA_Latest.zip)
+* [**Get AdditionalMaps overnight build**](http://carla-releases.s3.amazonaws.com/Windows/Dev/AdditionalMaps_Latest.zip)
 
 ### Recommended system
 

Util/BuildTools/Deploy.bat

@@ -5,9 +5,8 @@ rem ============================================================================
 rem -- Set up environment --------------------------------------------------------
 rem ==============================================================================
 
-set REPLACE_LATEST=false
+set REPLACE_LATEST=true
 set AWS_COPY=aws s3 cp
-set UPLOAD_MAPS=true
 
 rem ==============================================================================
 rem -- Parse arguments -----------------------------------------------------------
@@ -24,7 +23,7 @@ if not "%1"=="" (
     )
 
     if "%1"=="--dry-run" (
-      echo %AWS_COPY%
+      set AWS_COPY=rem aws s3 cp
     )
 
     if "%1"=="--help" (
@@ -40,32 +39,45 @@ if not "%1"=="" (
 rem Get repository version
 for /f %%i in ('git describe --tags --dirty --always') do set REPOSITORY_TAG=%%i
 if not defined REPOSITORY_TAG goto error_carla_version
+echo REPOSITORY_TAG = !REPOSITORY_TAG!
 
 rem Last package data
 set CARLA_DIST_FOLDER=%~dp0%\Build\UE4Carla
-set LATEST_PACKAGE=CARLA_%REPOSITORY_TAG%.zip
-set LATEST_PACKAGE_PATH=%CARLA_DIST_FOLDER%\%LATEST_PACKAGE%
+set PACKAGE=CARLA_%REPOSITORY_TAG%.zip
+set PACKAGE_PATH=%CARLA_DIST_FOLDER%\%PACKAGE%
+set PACKAGE2=AdditionalMaps_%REPOSITORY_TAG%.zip
+set PACKAGE_PATH2=%CARLA_DIST_FOLDER%\%PACKAGE2%
 
 set S3_PREFIX=s3://carla-releases/Windows
 
 set LATEST_DEPLOY_URI=!S3_PREFIX!/Dev/CARLA_Latest.zip
+set LATEST_DEPLOY_URI2=!S3_PREFIX!/Dev/AdditionalMaps_Latest.zip
 
 rem Check for TAG version
 echo %REPOSITORY_TAG% | findstr /R /C:"^[0-9]*\.[0-9]*\.[0-9]*.$" 1>nul
 if %errorlevel% == 0 (
-  echo Detected tag %REPOSITORY_TAG%
+  echo Detected release version with tag %REPOSITORY_TAG%
   set DEPLOY_NAME=CARLA_%REPOSITORY_TAG%.zip
+  set DEPLOY_NAME2=AdditionalMaps_%REPOSITORY_TAG%.zip
 ) else (
+  echo Detected non-release version with tag %REPOSITORY_TAG%
   set S3_PREFIX=!S3_PREFIX!/Dev
   git log --pretty=format:%%cd_%%h --date=format:%%Y%%m%%d -n 1 > tempo1234
   set /p DEPLOY_NAME= < tempo1234
   del tempo1234
   set DEPLOY_NAME=!DEPLOY_NAME!.zip
+  echo deploy name = !DEPLOY_NAME!
+  
+  git log --pretty=format:%%h -n 1 > tempo1234
+  set /p DEPLOY_NAME2= < tempo1234
+  del tempo1234
+  set DEPLOY_NAME2=AdditionalMaps_!DEPLOY_NAME2!.zip
+  echo deploy name2 = !DEPLOY_NAME2!
 )
 echo Version detected: %REPOSITORY_TAG%
-echo Using package %LATEST_PACKAGE% as %DEPLOY_NAME%
+echo Using package %PACKAGE% as %DEPLOY_NAME%
 
-if not exist "%LATEST_PACKAGE_PATH%" (
+if not exist "%PACKAGE_PATH%" (
   echo Latest package not found, please run 'make package'
   goto :bad_exit
 )
@@ -75,26 +87,22 @@ rem -- Upload ------------------------------------------------------------------
 rem ==============================================================================
 
 set DEPLOY_URI=!S3_PREFIX!/%DEPLOY_NAME%
-%AWS_COPY% %LATEST_PACKAGE_PATH% %DEPLOY_URI%
+%AWS_COPY% %PACKAGE_PATH% %DEPLOY_URI%
 echo Latest build uploaded to %DEPLOY_URI%
 
-if %REPLACE_LATEST%==true (
-  %AWS_COPY% %DEPLOY_URI% %LATEST_DEPLOY_URI%
-  echo Latest build uploaded to %LATEST_DEPLOY_URI%
-)
-
-if %UPLOAD_MAPS%==true (
+set DEPLOY_URI2=!S3_PREFIX!/%DEPLOY_NAME2%
+%AWS_COPY% %PACKAGE_PATH2% %DEPLOY_URI2%
+echo Latest build uploaded to %DEPLOY_URI2%
 
-  pushd "%CARLA_DIST_FOLDER%"
+rem ==============================================================================
+rem -- Replace Latest ------------------------------------------------------------
+rem ==============================================================================
 
-  for /f %%i in ('dir *_%REPOSITORY_TAG%.zip /b') do (
-    if not %%i == %LATEST_PACKAGE% (
-      set DEPLOY_MAP_URI=!S3_PREFIX!/%%i
-      %AWS_COPY% %%i !DEPLOY_MAP_URI!
-      echo %%i uploaded to !DEPLOY_MAP_URI!
-    )
-  )
-  popd
+if %REPLACE_LATEST%==true (
+  %AWS_COPY% %DEPLOY_URI% %LATEST_DEPLOY_URI%
+  echo Latest build updated as %LATEST_DEPLOY_URI%
+  %AWS_COPY% %DEPLOY_URI2% %LATEST_DEPLOY_URI2%
+  echo Latest build updated as %LATEST_DEPLOY_URI2%
 )
 
 rem ==============================================================================

Util/BuildTools/Deploy.sh

@@ -54,26 +54,33 @@ REPOSITORY_TAG=$(get_git_repository_version)
 
 LATEST_PACKAGE=CARLA_${REPOSITORY_TAG}.tar.gz
 LATEST_PACKAGE_PATH=${CARLA_DIST_FOLDER}/${LATEST_PACKAGE}
+LATEST_PACKAGE2=AdditionalMaps_${REPOSITORY_TAG}.tar.gz
+LATEST_PACKAGE_PATH2=${CARLA_DIST_FOLDER}/${LATEST_PACKAGE2}
 
 S3_PREFIX=s3://carla-releases/Linux
 
 LATEST_DEPLOY_URI=${S3_PREFIX}/Dev/CARLA_Latest.tar.gz
+LATEST_DEPLOY_URI2=${S3_PREFIX}/Dev/AdditionalMaps_Latest.tar.gz
 
 if [[ ${REPOSITORY_TAG} =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
   log "Detected tag ${REPOSITORY_TAG}."
   DEPLOY_NAME=CARLA_${REPOSITORY_TAG}.tar.gz
+  DEPLOY_NAME2=AdditionalMaps_${REPOSITORY_TAG}.tar.gz
   DOCKER_TAG=${REPOSITORY_TAG}
 elif [[ ${REPOSITORY_TAG} =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
   log "Detected tag ${REPOSITORY_TAG}."
   DEPLOY_NAME=CARLA_${REPOSITORY_TAG}.tar.gz
+  DEPLOY_NAME2=AdditionalMaps_${REPOSITORY_TAG}.tar.gz
   DOCKER_TAG=${REPOSITORY_TAG}
 else
   S3_PREFIX=${S3_PREFIX}/Dev
   DEPLOY_NAME=$(git log --pretty=format:'%cd_%h' --date=format:'%Y%m%d' -n 1).tar.gz
+  DEPLOY_NAME2=AdditionalMaps_$(git log --pretty=format:'%cd_%h' --date=format:'%Y%m%d' -n 1).tar.gz
   DOCKER_TAG=latest
 fi
 
 log "Using package ${LATEST_PACKAGE} as ${DEPLOY_NAME}."
+log "Using package ${LATEST_PACKAGE2} as ${DEPLOY_NAME2}."
 
 if [ ! -f ${LATEST_PACKAGE_PATH} ]; then
   fatal_error "Latest package not found, please run 'make package'."
@@ -84,36 +91,25 @@ fi
 # ==============================================================================
 
 DEPLOY_URI=${S3_PREFIX}/${DEPLOY_NAME}
+DEPLOY_URI2=${S3_PREFIX}/${DEPLOY_NAME2}
 
 ${AWS_COPY} ${LATEST_PACKAGE_PATH} ${DEPLOY_URI}
-
 log "Latest build uploaded to ${DEPLOY_URI}."
 
+${AWS_COPY} ${LATEST_PACKAGE_PATH2} ${DEPLOY_URI2}
+log "Latest build uploaded to ${DEPLOY_URI2}."
+
+# ==============================================================================
+# -- Replace Latest ------------------------------------------------------------
+# ==============================================================================
+
 if ${REPLACE_LATEST} ; then
 
   ${AWS_COPY} ${DEPLOY_URI} ${LATEST_DEPLOY_URI}
-
   log "Latest build uploaded to ${LATEST_DEPLOY_URI}."
-
-fi
-
-if ${UPLOAD_MAPS} ; then
-
-  mkdir -p ${CARLA_DIST_FOLDER}
-
-  pushd "${CARLA_DIST_FOLDER}" >/dev/null
-
-  for MAP_PACKAGE in *_${REPOSITORY_TAG}.tar.gz ; do if [[ ${MAP_PACKAGE} != ${LATEST_PACKAGE} ]] ; then
-
-    DEPLOY_MAP_URI=${S3_PREFIX}/${MAP_PACKAGE}
-
-    ${AWS_COPY} ${MAP_PACKAGE} ${DEPLOY_MAP_URI}
-
-    log "${MAP_PACKAGE} uploaded to ${DEPLOY_MAP_URI}."
-
-  fi ; done
-
-  popd >/dev/null
+  
+  ${AWS_COPY} ${DEPLOY_URI2} ${LATEST_DEPLOY_URI2}
+  log "Latest build uploaded to ${LATEST_DEPLOY_URI2}."
 
 fi