ci: improve scripting

akrherz · Jan 18, 2024 · 7bc038f · 7bc038f
1 parent 53ce3de
commit 7bc038f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,6 +48,7 @@ jobs:
 
     - name: Setup Postgres
       run: |
+        set -e
         git clone --depth 1 https://github.com/akrherz/iem-database.git database
         git clone --depth 1 https://github.com/akrherz/ci_tooling.git .ci_tooling
         . .ci_tooling/postgres.sh
@@ -76,7 +77,10 @@ jobs:
 
     - name: Configure Webfarm Server
       run: |
-        . .ci_tooling/iemwebfarm.sh
+        set -e
+        cd .ci_tooling
+        . iemwebfarm.sh
+        cd ..
         sudo mkdir -p /mesonet/www/logs
         sudo ln -s `pwd` /opt/iem
         sudo ln -s $HOME/micromamba /opt/miniconda3

diff --git a/.github/workflows/mapserver.yml b/.github/workflows/mapserver.yml
@@ -19,10 +19,13 @@ jobs:
 
     - name: Setup CI from ci-tooling
       run: |
+        set -e
         git clone --depth 1 https://github.com/akrherz/iem-database.git database
         git clone --depth 1 https://github.com/akrherz/ci_tooling.git .ci_tooling
-        . .ci_tooling/iemwebfarm.sh
-        . .ci_tooling/postgres.sh
+        cd ci_tooling
+        . iemwebfarm.sh
+        . postgres.sh
+        cd ..
         sudo ln -s `pwd` /opt/iem
         sudo ln -s $HOME/miniconda /opt/miniconda3
         sudo apt-get install mapserver-bin
@@ -32,4 +35,5 @@ jobs:
 
     - name: Run map2img
       run: |
+        set -e
         bash test/run_mapserver.sh