From c01c9c11c2e30c7207909a7619eceaa4e12697f9 Mon Sep 17 00:00:00 2001
From: luandro <luandro@digital-democracy.org>
Date: Sat, 17 Feb 2024 16:44:00 -0300
Subject: [PATCH] Simplify

---
 .github/workflows/docker-publish.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index f51483b..06cc856 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -78,18 +78,14 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up environment variables for API key and Mapbox style
+      - name: Set up environment variables
         run: |
-          if [ "${{ matrix.apikey_secret }}" != "" ]; then
-            echo "APIKEY=${{ secrets[matrix.apikey_secret] }}" >> $GITHUB_ENV
-          fi
-          if [ "${{ matrix.style }}" == "mapbox" ]; then
-            echo "MAPBOX_STYLE=${{ secrets.MAPBOX_STYLE }}" >> $GITHUB_ENV
-          fi
-      - name: Test run of Docker image with ${{ matrix.style }} style
+          [[ "${{ matrix.apikey_secret }}" ]] && echo "APIKEY=${{ secrets[matrix.apikey_secret] }}" >> $GITHUB_ENV
+          [[ "${{ matrix.style }}" == "mapbox" ]] && echo "MAPBOX_STYLE=${{ secrets.MAPBOX_STYLE }}" >> $GITHUB_ENV
+      - name: Test Docker image
         run: |
-          docker run --rm -v ${{ github.workspace }}/outputs:/app/outputs ${{ needs.build-and-deploy.outputs.tags }} ${{ matrix.command }} --bounds "-54.28772,3.11460,-54.03630,3.35025" -Z ${{ matrix.style == 'planet' && '5' || '10' }} -f ${{ matrix.style }}-${{ needs.build-and-deploy.outputs.version }} ${{ env.MAPBOX_STYLE && '--mapboxstyle' || '' }} ${{ env.MAPBOX_STYLE || '' }} ${{ env.APIKEY && '--apikey' || '' }} ${{ env.APIKEY || '' }}
-      - name: Upload mbtiles artifacts
+          docker run --rm -v ${{ github.workspace }}/outputs:/app/outputs ${{ needs.build-and-deploy.outputs.tags }} ${{ matrix.command }} --bounds "-54.28772,3.11460,-54.03630,3.35025" -Z ${{ matrix.style == 'planet' && '5' || '10' }} -f ${{ matrix.style }}-${{ needs.build-and-deploy.outputs.version }} ${env.MAPBOX_STYLE:+--mapboxstyle $env.MAPBOX_STYLE} ${env.APIKEY:+--apikey $env.APIKEY}
+      - name: Upload mbtiles
         uses: actions/upload-artifact@v2
         with:
           name: mbtiles-${{ needs.build-and-deploy.outputs.version }}