Skip to content

Commit

Permalink
Merge pull request #175 from SpectralVectors/master
Browse files Browse the repository at this point in the history
Test Suite Fixes
  • Loading branch information
pppalain authored Sep 5, 2024
2 parents abb3bda + d907e9c commit 161aa6a
Show file tree
Hide file tree
Showing 64 changed files with 175,536 additions and 176,767 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ jobs:
fail-fast: false
matrix:
os: ['ubuntu-latest','windows-latest']
blender_version: ['3.6.7','4.1']
include:
- os: 'macos-latest'
blender_version: 'ignored'
blender_version: ['4.2.1']
# include:
# - os: 'macos-latest'
# blender_version: '4.2.1'
runs-on: ${{matrix.os}}
steps:
- name: Checkout repository
uses: actions/[email protected]
- name: Install bash 4(macOS)
if: runner.os == 'macOS'
run: brew install bash
- name: Install blender (macOS)
if: runner.os == 'macOS'
run: brew install --cask blender
# - name: Install bash 4(macOS)
# if: runner.os == 'macOS'
# run: brew install bash
# - name: Install blender (macOS)
# if: runner.os == 'macOS'
# run: brew install --cask blender
- name: Cache blender
id: cache-blender
if: runner.os != 'macOS'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">

![BlenderCAM](documentation/images/logo.png)

- - -
Expand Down
1 change: 1 addition & 0 deletions scripts/addons/cam/tests/gcode_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

# Get the scene
s = bpy.context.scene
s.render.engine = 'CNCCAM_RENDER'

for i, operation in enumerate(s.cam_operations):
# Set the active operation using the index
Expand Down
9 changes: 6 additions & 3 deletions scripts/addons/cam/tests/install_addon.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@

INSTALL_CODE = f"""
import bpy
bpy.ops.preferences.addon_install(filepath='{sys.argv[1]}')
bpy.ops.preferences.addon_enable(module='cam')
bpy.context.preferences.system.use_online_access = True
bpy.ops.extensions.repo_sync_all(use_active_only=False)
bpy.ops.extensions.package_install_files(filepath='{sys.argv[1]}', repo='user_default')
bpy.ops.extensions.package_install(repo_index=0, pkg_id="stl_format_legacy")
bpy.ops.extensions.package_install(repo_index=0, pkg_id="simplify_curves_plus")
bpy.ops.extensions.package_install(repo_index=0, pkg_id="curve_tools")
bpy.ops.wm.save_userpref()
import cam
"""

NUM_RETRIES = 10
Expand Down
Binary file modified scripts/addons/cam/tests/test_data/4axistest/4axistest.blend
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 161aa6a

Please sign in to comment.