fix: do not download envsubst if not required

hotosm · Feb 15, 2024 · 9448a10 · 9448a10
1 parent e9717aa
commit 9448a10
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 35 deletions.
diff --git a/.github/workflows/openapi_build.yml b/.github/workflows/openapi_build.yml
@@ -32,13 +32,12 @@ jobs:
         env:
           EXAMPLE_DOTENV: ${{ inputs.example_env_file_path }}
         run: |
-          # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
-          echo "Downloading envsubst"
-          curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
-          chmod +x envsubst
-
           echo "Checking if ${EXAMPLE_DOTENV} exists"
           if [ -f ${EXAMPLE_DOTENV} ]; then
+            # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
+            echo "Downloading envsubst"
+            curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
+            chmod +x envsubst
             echo "Substituting variables from ${EXAMPLE_DOTENV} --> .env"
             ./envsubst < "${EXAMPLE_DOTENV}" > .env
           else

diff --git a/.github/workflows/remote_deploy.yml b/.github/workflows/remote_deploy.yml
@@ -52,17 +52,16 @@ jobs:
 
       - name: Create .env file
         run: |
-          # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
-          echo "Downloading envsubst"
-          curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
-          chmod +x envsubst
-
-          # Check if .env.example exists
-          if [ -f .env.example ]; then
-            echo "Substituting variables from .env.example --> .env"
-            ./envsubst < .env.example > .env
+          echo "Checking if ${EXAMPLE_DOTENV} exists"
+          if [ -f ${EXAMPLE_DOTENV} ]; then
+            # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
+            echo "Downloading envsubst"
+            curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
+            chmod +x envsubst
+            echo "Substituting variables from ${EXAMPLE_DOTENV} --> .env"
+            ./envsubst < "${EXAMPLE_DOTENV}" > .env
           else
-            echo ".env.example not found, creating empty .env"
+            echo "${EXAMPLE_DOTENV} not found, creating empty .env"
             touch .env
           fi
 

diff --git a/.github/workflows/test_compose.yml b/.github/workflows/test_compose.yml
@@ -224,17 +224,16 @@ jobs:
 
       - name: Create .env file
         run: |
-          # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
-          echo "Downloading envsubst"
-          curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
-          chmod +x envsubst
-
-          # Check if .env.example exists
-          if [ -f .env.example ]; then
-            echo "Substituting variables from .env.example --> .env"
-            ./envsubst < .env.example > .env
+          echo "Checking if ${EXAMPLE_DOTENV} exists"
+          if [ -f ${EXAMPLE_DOTENV} ]; then
+            # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
+            echo "Downloading envsubst"
+            curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
+            chmod +x envsubst
+            echo "Substituting variables from ${EXAMPLE_DOTENV} --> .env"
+            ./envsubst < "${EXAMPLE_DOTENV}" > .env
           else
-            echo ".env.example not found, creating empty .env"
+            echo "${EXAMPLE_DOTENV} not found, creating empty .env"
             touch .env
           fi
 

diff --git a/.github/workflows/test_pytest.yml b/.github/workflows/test_pytest.yml
@@ -157,17 +157,16 @@ jobs:
 
       - name: Create .env file
         run: |
-          # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
-          echo "Downloading envsubst"
-          curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
-          chmod +x envsubst
-
-          # Check if .env.example exists
-          if [ -f .env.example ]; then
-            echo "Substituting variables from .env.example --> .env"
-            ./envsubst < .env.example > .env
+          echo "Checking if ${EXAMPLE_DOTENV} exists"
+          if [ -f ${EXAMPLE_DOTENV} ]; then
+            # Get a8m/envsubst (required for default vals syntax ${VAR:-default})
+            echo "Downloading envsubst"
+            curl -L https://github.com/a8m/envsubst/releases/download/v1.2.0/envsubst-`uname -s`-`uname -m` -o envsubst
+            chmod +x envsubst
+            echo "Substituting variables from ${EXAMPLE_DOTENV} --> .env"
+            ./envsubst < "${EXAMPLE_DOTENV}" > .env
           else
-            echo ".env.example not found, creating empty .env"
+            echo "${EXAMPLE_DOTENV} not found, creating empty .env"
             touch .env
           fi