Merge branch 'check_failing'

nangtani · Mar 30, 2020 · d2732f1 · d2732f1
2 parents 535977a + dfc8fec
commit d2732f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 27 deletions.
diff --git a/.github/workflows/test-fake-addon-example-from-github-pip-nightly.yml b/.github/workflows/test-fake-addon-example-from-github-pip-nightly.yml
@@ -34,13 +34,25 @@ jobs:
         sudo add-apt-repository ppa:thomas-schiex/blender-legacy
         sudo apt-get update
         sudo apt-get install blender
-    - name: Download and Test Blender ${{ matrix.blender-version }} x ${{ matrix.os}}
+    - name: Setup Environment
       run: |
-        cd examples/testing-fake-addon/
+        # This testing script will make use of BLENDER_VERSION and BLENDER_CACHE
+        cd examples/testing-*/
         pip install -r requirements.txt
-        # These scripts will detect and use the BLENDER_CACHE environment variable
-        python test_addon_blender.py $BLENDER_VERSION && python test_fake_addon_blender_advanced.py $BLENDER_VERSION && python test_fake_addon_blender_prezipped_addon.py $BLENDER_VERSION 
-    - name: Expose coverage as a CI download # Related to test_fake_addon_blender_advanced.py
+    - name: Download and Test Blender ${{ matrix.blender-version }} x ${{ matrix.os}}
+      run: |
+        cd examples/testing-*/
+        pwd
+        python test_addon_blender.py ${{ matrix.blender-version }} fake_addon
+    - name: Test Blender ${{ matrix.blender-version }} x ${{ matrix.os}} Advanced
+      run: |
+        cd examples/testing-*/
+        python test_addon_blender_advanced.py ${{ matrix.blender-version }} fake_addon
+    - name: Test Blender ${{ matrix.blender-version }} x ${{ matrix.os}} Prezipped Addon
+      run: |
+        cd examples/testing-*/
+        python test_addon_blender_prezipped_addon.py ${{ matrix.blender-version }} fake_addon
+    - name: Expose coverage as a CI download # Related to test_addon_blender_advanced.py
       uses: actions/upload-artifact@v1
       with:
         name: coverage.xml

diff --git a/.github/workflows/test-fake-addon-example-from-local-wheel.yml b/.github/workflows/test-fake-addon-example-from-local-wheel.yml
@@ -12,7 +12,6 @@ jobs:
       max-parallel: 4
       matrix:
         blender-version: ["2.78c", "2.79b", "2.80", "2.81a", "2.82a", "2.83"]
-        #blender-version: ["2.79b", "2.80"]
         os: [macos-latest, ubuntu-latest, windows-latest]
     env:
       BLENDER_CACHE: ${{ github.workspace }}/.blender_releases_cache # The place where blender releases are downloaded
@@ -54,9 +53,8 @@ jobs:
       run: |
         cd examples/testing-*/
         python test_addon_blender_prezipped_addon.py ${{ matrix.blender-version }} fake_addon
-#         cd ../..
-#     - name: Expose coverage as a CI download # Related to test_fake_addon_blender_advanced.py
-#       uses: actions/upload-artifact@v1
-#       with:
-#         name: coverage.xml
-#         path: examples/testing-fake-addon/coverage.xml
+    - name: Expose coverage as a CI download # Related to test_fake_addon_blender_advanced.py
+      uses: actions/upload-artifact@v1
+      with:
+        name: coverage.xml
+        path: examples/testing-fake-addon/coverage.xml
diff --git a/blender_addon_tester/get_blender.py b/blender_addon_tester/get_blender.py
@@ -124,12 +124,6 @@ def getBlender(blender_version, blender_zippath, nightly):
     if os.path.exists(dst):
         if nightly == True or remove:
             print(f"Removing directory (nightly:{nightly}, remove:{remove}): {dst}")
-            #cmd
-            for root, dirs, files in os.walk(dst):
-                for d in dirs:
-                    os.chmod(os.path.join(root, d), 0o777)
-                for f in files:
-                    os.chmod(os.path.join(root, f), 0o777)            
             shutil.rmtree(dst)
         else:
             print(f"Blender {blender_version} (non-nightly) release found at: {dst}")
@@ -224,7 +218,7 @@ def getBlender(blender_version, blender_zippath, nightly):
             python = os.path.realpath(zfile)
             print(f"Blender's bundled python executable was found: {python}")
             print("Adding executable rights to blender bundled python binary file")
-            os.chmod(python, stat.S_IXOTH | stat.S_IXGRP | stat.S_IXUSR)
+            os.chmod(python, os.stat(python).st_mode | stat.S_IXOTH | stat.S_IXGRP | stat.S_IXUSR)
             break
     if not python:
         print("ERROR, Blender's bundled python executable could not be found within Blender's files")

diff --git a/rebuild_pipreinstall_and_testexamples.sh b/rebuild_pipreinstall_and_testexamples.sh
@@ -1,15 +1,7 @@
 # Set a BLENDER_CACHE if not set yet
 export BLENDER_CACHE=${BLENDER_CACHE:-"~/.blender_cache"}
-# Set a BLENDER_VERSION if not set yet
-export BLENDER_VERSION=${BLENDER_VERSION:-"2.80"}
 rm -rf build/ dist/ *.egg-info
 pip install -r requirements.txt
 pip uninstall blender_addon_tester -y
 python setup.py bdist_wheel
 pip install dist/*.whl
-# cd examples/testing-*/
-# pwd
-# for testable_file in $(ls test_addon*.py); do
-#   python "$testable_file" $BLENDER_VERSION fake_addon;
-# done
-# cd ../..