Fix additional maps link

bounverif · Jun 12, 2024 · b8623e8 · b8623e8
1 parent f960ba8
commit b8623e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/carlasim-release.yml b/.github/workflows/carlasim-release.yml
@@ -11,6 +11,10 @@ env:
   IMAGE_NAME: bounverif/carla
   CARLA_VERSION: 0.9.15
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   server-build:
     runs-on: ubuntu-latest
@@ -24,7 +28,7 @@ jobs:
         with:
           # this might remove tools that are actually needed,
           # if set to "true" but frees about 6 GB
-          tool-cache: false
+          tool-cache: true
 
           # all of these default to true, but feel free to set to
           # "false" if necessary for your workflow
@@ -55,6 +59,8 @@ jobs:
             "CARLA_VERSION=${{ env.CARLA_VERSION }}"
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:release-${{ env.CARLA_VERSION }}
           push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Build and push extended image
         uses: docker/build-push-action@v5
@@ -65,3 +71,5 @@ jobs:
             "CARLA_VERSION=${{ env.CARLA_VERSION }}"
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:release-extra-${{ env.CARLA_VERSION }}
           push: true
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
diff --git a/carlasim/release/Dockerfile b/carlasim/release/Dockerfile
@@ -4,6 +4,8 @@ ARG CARLA_VERSION=0.9.15
 ARG CARLA_RELEASE_SERVER=https://carla-releases.s3.us-east-005.backblazeb2.com/Linux
 ARG CARLA_RELEASE_TAR=CARLA_${CARLA_VERSION}.tar.gz
 ARG CARLA_RELEASE_URL=${CARLA_RELEASE_SERVER}/${CARLA_RELEASE_TAR}
+ARG CARLA_ADDITIONAL_MAPS_TAR=AdditionalMaps_${CARLA_VERSION}.tar.gz
+ARG CARLA_ADDITIONAL_MAPS_URL=${CARLA_RELEASE_SERVER}/${CARLA_ADDITIONAL_MAPS_TAR}
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV PIP_NO_CACHE_DIR=true