From e907fc5083bc8a901ff0a8f9c466813b13533d7e Mon Sep 17 00:00:00 2001
From: Vincent Fazio <vjf@users.noreply.github.com>
Date: Mon, 22 Jul 2024 12:35:34 +1000
Subject: [PATCH] Fix COLLADA2GLTF_BIN env var

---
 .github/workflows/build-models.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-models.yml b/.github/workflows/build-models.yml
index 6c77ce3..51de858 100644
--- a/.github/workflows/build-models.yml
+++ b/.github/workflows/build-models.yml
@@ -29,7 +29,6 @@ jobs:
         pushd COLLADA2GLTF
         wget https://github.com/KhronosGroup/COLLADA2GLTF/releases/download/v2.1.5/COLLADA2GLTF-v2.1.5-linux.zip
         unzip COLLADA2GLTF-v2.1.5-linux.zip
-        export COLLADA2GLTF_BIN=`pwd`
         popd
     - name: Install model sources
       run: |
@@ -37,6 +36,7 @@ jobs:
         pushd MODEL_SRC
         wget https://github.com/AuScope/geomodel-2-3dweb/releases/download/PORTAL_RELEASE_20210718/GEOMODELS_SRC-GA.tar.gz
         tar xvfz GEOMODELS_SRC-GA.tar.gz
+        popd
     - name: Install pdm
       run: |
         python -m pip install --upgrade pip
@@ -46,10 +46,11 @@ jobs:
         pdm install
     - name: Build
       run: |
+        export COLLADA2GLTF_BIN=`pwd`/COLLADA2GLTF
+        echo "COLLADA2GLTF_BIN=$COLLADA2GLTF_BIN"
         export GEOMODELS_HOME=`pwd`/MODEL_SRC
         echo "GEOMODELS_HOME=$GEOMODELS_HOME"
         eval $(pdm venv activate)
-        env
         cd web_build/
         ./batch_proc.py