support blender install linux

ikappaki · Jul 30, 2024 · fae65a5 · fae65a5
1 parent 0ba4c57
commit fae65a5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/tests-run.yml b/.github/workflows/tests-run.yml
@@ -13,12 +13,14 @@ concurrency:
 jobs:
   run-tests:
     runs-on: ${{matrix.os}}
+    env:
+      BB_BLENDER_TEST_HOME: "~/blender"
     strategy:
       matrix:
         # os: [ubuntu-latest, windows-latest, macos-latest]
         os: [ubuntu-latest]
         version: ['3.11']
-        blender: ['4.2']
+        blender: ['4.2.0']
 
     steps:
       - uses: actions/checkout@v4
@@ -55,9 +57,7 @@ jobs:
       - name: Install Blender
         if: steps.cache-blender.outputs.cache-hit != 'true'
         run: |
-          wget https://download.blender.org/release/Blender${{ matrix.blender }}/blender-${{ matrix.blender }}.0-linux-x64.tar.xz
-          mkdir ~/blender
-          tar -xf blender-${{ matrix.blender }}.0-linux-x64.tar.xz -C ~/blender --strip-components=1
+          poetry run python scripts/blender_install.py ${{ matrix.blender }} ~/blender
           
       - name: "Save Blender in cache"
         if: steps.cache-blender.outputs.cache-hit != 'true'
@@ -73,8 +73,6 @@ jobs:
 
       - name: Run integration tests
         run: |
-          ~/blender/blender --version
-          export PATH="$PATH:$HOME/blender"
           poetry build
           poetry run python scripts/bb_package_install.py
           poetry run pytest -m integration -v
diff --git a/scripts/blender_install.py b/scripts/blender_install.py
@@ -3,7 +3,6 @@
 import requests
 import shutil
 import sys
-import zipfile
 
 tmp_dir = ".bb-tmp"
 
@@ -24,6 +23,10 @@
 if system == 'Windows':
     filename = f'blender-{version}-windows-x64.zip'
     extension = ".zip"
+elif system == 'Linux':
+    filename = f'blender-{version}-linux-x64.tar.xz'
+    extension = ".tar.xz"
+
 assert filename, f":error :system-unsupported {system}"
 assert extension
 
@@ -49,8 +52,13 @@
 extract_dir = os.path.join(tmp_dir, filename[:filename.rfind(extension)])
 print(f'\n:extracting {filename_path} :to {tmp_dir} :as {extract_dir}')
 if system == 'Windows':
-  with zipfile.ZipFile(filename_path) as zip_ref:
-      zip_ref.extractall(tmp_dir)
+    import zipfile
+    with zipfile.ZipFile(filename_path) as zip_ref:
+        zip_ref.extractall(tmp_dir)
+elif system == 'Linux':
+    import tarfile
+    with tarfile.open(filename_path) as tar:
+        tar.extractall(path=tmp_dir)
 print(f":extract :done")
 assert os.path.exists(extract_dir)
 

diff --git a/tests/basilisp_blender/integration/test_utils.py b/tests/basilisp_blender/integration/test_utils.py
@@ -12,16 +12,17 @@
 def blender_path_get():
     blender_home = os.getenv(ENV_BLENDER_HOME_)
     assert blender_home, f":error :env-var-not-set {ENV_BLENDER_HOME_}"
+    blender_home_abs = os.path.abspath(os.path.expanduser(blender_home))
     exec_path = None
     envpath = os.environ.get('PATH', '')
-    envpath_new = blender_home
+    envpath_new = blender_home_abs
     try:
         os.environ['PATH'] = envpath_new
         exec_path = shutil.which('blender')
     finally:
         os.environ['PATH'] = envpath
-    assert exec_path, f":error :blender-exec-not-found-in {ENV_BLENDER_HOME_}={blender_home}"
-    print(f":blender-found-at {ENV_BLENDER_HOME_}={blender_home}")
+    assert exec_path, f":error :blender-exec-not-found-in {ENV_BLENDER_HOME_}={blender_home_abs}"
+    print(f":blender-found-at {ENV_BLENDER_HOME_}={blender_home_abs} :exec {exec_path}")
     return exec_path
 
 def file_exists_wait(filepath, count, interval_ms):