From d2f852d451c279c967bea714fd312e918e8906fb Mon Sep 17 00:00:00 2001
From: Wentao Kuang <wt.kuang@icloud.com>
Date: Tue, 9 Apr 2024 09:59:31 +1200
Subject: [PATCH] build: Upgrade the basemaps cli to version v7.2.0 (#879)

#### Motivation

Upgrade the cli version for the ci cd.

#### Modification

The new config cli will be able to bundle the elevation config and
individual vector tilesets. And it also add the cache to the
`linz-basemaps-scrach` bucket for bundling performance.

#### Checklist

_If not applicable, provide explanation of why._

- [ ] Tests updated
- [ ] Docs updated
- [ ] Issue linked in Title
---
 .github/workflows/build.yml | 4 ++--
 scripts/bmc.sh              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa9498c9..eac7623e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Bundle Config File
         run: |
-          ./scripts/bmc.sh bundle --config $PWD/config --output $PWD/config-staging.json --assets ${ASSETS_LOCATION_STAGING}
+          ./scripts/bmc.sh bundle --config $PWD/config --output $PWD/config-staging.json --assets ${ASSETS_LOCATION_STAGING} --cache s3://linz-basemaps-staging/basemaps-config/cache/
           CONFIG_HASH_STAGING=$(cat config-staging.json | jq .hash -r)
           echo "CONFIG_LOCATION_STAGING=s3://linz-basemaps-staging/config/config-${CONFIG_HASH_STAGING}.json.gz" >> $GITHUB_ENV
 
@@ -169,7 +169,7 @@ jobs:
 
           # aws s3 cp assets-current.tar.co ${ASSETS_LOCATION_PROD}
 
-          ./scripts/bmc.sh bundle --config $PWD/config-current.json.gz --output $PWD/config-prod.json --assets ${ASSETS_LOCATION_PROD}
+          ./scripts/bmc.sh bundle --config $PWD/config-current.json.gz --output $PWD/config-prod.json --assets ${ASSETS_LOCATION_PROD} --cache s3://linz-basemaps-staging/basemaps-config/cache/
 
           CONFIG_HASH_PROD=$(cat config-prod.json | jq .hash -r)
           echo "CONFIG_LOCATION_PROD=s3://linz-basemaps/config/config-${CONFIG_HASH_PROD}.json.gz" >> $GITHUB_ENV
diff --git a/scripts/bmc.sh b/scripts/bmc.sh
index e7430916..c25c0d97 100755
--- a/scripts/bmc.sh
+++ b/scripts/bmc.sh
@@ -5,5 +5,5 @@ docker run \
   -v ${PWD}:${PWD} \
   -p 5000:5000 \
   -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e AWS_REGION -e AWS_DEFAULT_REGION \
-  ghcr.io/linz/basemaps/cli:v7.0.0-10-g82970b53 \
+  ghcr.io/linz/basemaps/cli:v7.2.0 \
   "$@"
\ No newline at end of file