Merge branch 'master' of https://github.com/AuScope/geomodel-2-3dweb

AuScope · Sep 5, 2024 · 6d3bf7c · 6d3bf7c
2 parents 397c278 + ed936e3
commit 6d3bf7c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-models.yml b/.github/workflows/build-models.yml
@@ -169,8 +169,8 @@ jobs:
         eval $(pdm venv activate for-backend-build)
         # Temporarily, a patched version of assimp lives in the 'test' dir
         # It was installed and built via 'pdm install'
-        ASSIMP_VER=5.2.5
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/test/assimp-$ASSIMP_VER/bin
+        ASSIMP_VER=5.4.3
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/assimp-$ASSIMP_VER/bin
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
         pushd web_build
         ./make_boreholes.py -b batch.txt -d query_data.db boreholes

diff --git a/.github/workflows/build_backend.yml b/.github/workflows/build_backend.yml
@@ -40,7 +40,7 @@ jobs:
         eval $(pdm venv activate for-backend-build)
         # NB: assimp was installed and built via 'pdm install'
         ASSIMP_VER=5.4.3
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/test/assimp-$ASSIMP_VER/bin
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/assimp-$ASSIMP_VER/bin
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
         pushd web_build
         ./make_boreholes.py -b batch.txt -d query_data.db boreholes