fmt

Author: vincentsarago

.github/workflows/ci.yml

@@ -33,50 +33,51 @@ jobs:
           path: /tmp/docker
           key: ${{ matrix.image-name }}-${{ hashFiles(format('common/{0}/Dockerfile', matrix.image-name)) }}
 
-      - name: create base image
-        if: steps.common-cache.outputs.cache-hit != 'true'
-        run: |
-            docker build -f common/${{ matrix.image-name }}/Dockerfile -t ${{ matrix.image-name }}:build .
-            mkdir -p /tmp/docker
-            docker image save -o /tmp/docker/${{ matrix.image-name }}.tar ${{ matrix.image-name }}:build
-
       - name: Restore base image
         if: steps.common-cache.outputs.cache-hit == 'true'
+        run: docker image load -i /tmp/docker/${{ matrix.image-name }}.tar
+
+      - name: Build base image
+        run: docker build -f common/${{ matrix.image-name }}/Dockerfile -t ${{ matrix.image-name }}:build .
+
+      - name: Save base image in Cache
+        if: steps.common-cache.outputs.cache-hit != 'true'
         run: |
-            docker image load -i /tmp/docker/${{ matrix.image-name }}.tar
-            docker images
+          mkdir -p /tmp/docker
+          docker image save -o /tmp/docker/${{ matrix.image-name }}.tar ${{ matrix.image-name }}:build
 
-      - name: GDAL build Cache
+      - name: GDAL build cache
         uses: actions/cache@v2
         id: gdal-cache
         with:
           path: /tmp/docker
           key: gdal${{ matrix.gdal-version }}-${{ hashFiles(format('gdal{0}/Dockerfile', matrix.gdal-version)) }}-${{ hashFiles(format('common/{0}/Dockerfile', matrix.image-name)) }}
 
-      - name: create gdal docker image
-        if: steps.gdal-cache.outputs.cache-hit != 'true'
-        run: |
-            docker build \
-                --build-arg IMAGE_VERSION=${{ matrix.image-name }} \
-                -f gdal${{ matrix.gdal-version }}/Dockerfile \
-                -t lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }} .
-            mkdir -p /tmp/docker
-            docker image save \
-                -o /tmp/docker/lambda-${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar \
-                lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }}
-
-      - name: Restore dependencies
+      - name: Restore gdal image
         if: steps.gdal-cache.outputs.cache-hit == 'true'
+        run: docker image load -i /tmp/docker/lambda-${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar
+
+      - name: Build gdal docker image
         run: |
-            docker image load -i /tmp/docker/lambda-${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar
-            docker images
+          docker build \
+            --build-arg IMAGE_VERSION=${{ matrix.image-name }} \
+            -f gdal${{ matrix.gdal-version }}/Dockerfile \
+            -t lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }} .
+
+      - name: Save gdal image in Cache
+        if: steps.gdal-cache.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p /tmp/docker
+          docker image save \
+            -o /tmp/docker/lambda-${{ matrix.image-name }}-gdal${{ matrix.gdal-version }}.tar \
+            lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }}
 
       - name: Run Tests
         run: |
           docker run \
-              -v ${{ github.workspace }}:/local --rm \
-              lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }} \
-              sh -c "cd /local/tests && sh tests.sh"
+            -v ${{ github.workspace }}:/local --rm \
+            lambgeo/lambda-${{ matrix.image-name }}:gdal${{ matrix.gdal-version }} \
+            sh -c "cd /local/tests && sh tests.sh"
 
       - name: Push to DockerHub
         if: contains(github.ref, 'tags')
@@ -113,8 +114,8 @@ jobs:
           run: |
             for GDAL_VERSION in ${GDAL_VERSIONS}; do
               docker build \
-                  --build-arg GDAL_VERSION=${GDAL_VERSION} \
-                  -f runtimes/${{ matrix.runtimes }} \
-                  -t lambgeo/lambda:gdal${GDAL_VERSION}-${{ matrix.runtimes }} .
+                --build-arg GDAL_VERSION=${GDAL_VERSION} \
+                -f runtimes/${{ matrix.runtimes }} \
+                -t lambgeo/lambda:gdal${GDAL_VERSION}-${{ matrix.runtimes }} .
               docker push lambgeo/lambda:gdal${GDAL_VERSION}-${{ matrix.runtimes }}
             done