diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index f161a75..bba3bd0 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -102,16 +102,13 @@ jobs: package-addon: needs: [build-wheels, test-python] - strategy: - matrix: - include: - - blender-version: "5.0.0" - blender-url-dir: "Blender5.0" - python-tag: "cp311" - - blender-version: "5.1.0" - blender-url-dir: "Blender5.1" - python-tag: "cp313" runs-on: ubuntu-latest + env: + # Blender version used only to run `extension build --split-platforms`. + # The output zips are consumed by the user's Blender at install time, so + # this version does not affect runtime compatibility. Bump when needed. + BLENDER_VERSION: "5.1.0" + BLENDER_SERIES: "5.1" steps: - uses: actions/checkout@v6 - uses: actions/setup-python@v6 @@ -119,20 +116,15 @@ jobs: python-version: "3.11" - uses: actions/download-artifact@v7 with: - path: all-wheels + path: wheels merge-multiple: true - - name: Filter wheels for Python version - run: | - mkdir -p wheels - cp all-wheels/*${{ matrix.python-tag }}*.whl wheels/ || true - echo "Filtered wheels for ${{ matrix.python-tag }}:" - ls -la wheels/ + - name: Display downloaded wheels + run: ls -la wheels/ - name: Install Blender run: | set -e - BLENDER_VERSION="${{ matrix.blender-version }}" BLENDER_TAR="blender-${BLENDER_VERSION}-linux-x64.tar.xz" - BLENDER_URL="https://download.blender.org/release/${{ matrix.blender-url-dir }}/${BLENDER_TAR}" + BLENDER_URL="https://download.blender.org/release/Blender${BLENDER_SERIES}/${BLENDER_TAR}" mkdir -p "$HOME/blender" curl -L "$BLENDER_URL" -o "$HOME/blender/$BLENDER_TAR" tar -xJf "$HOME/blender/$BLENDER_TAR" -C "$HOME/blender" @@ -145,17 +137,11 @@ jobs: ADDON_ROOT="tmp/modular_tree_${VERSION}/modular_tree" cd "$ADDON_ROOT" blender --command extension build --split-platforms --output-dir ../../ - - name: Rename extensions to include Python tag - run: | - cd tmp - for f in *.zip; do - mv "$f" "${f%.zip}-${{ matrix.python-tag }}.zip" - done - name: Display built extensions run: ls -la tmp/*.zip - uses: actions/upload-artifact@v6 with: - name: modular_tree_extension_${{ matrix.python-tag }} + name: modular_tree_extension path: tmp/*.zip release: @@ -167,9 +153,8 @@ jobs: - uses: actions/checkout@v6 - uses: actions/download-artifact@v7 with: - pattern: modular_tree_extension_* + name: modular_tree_extension path: release - merge-multiple: true - name: Display structure of downloaded files run: ls -R release - name: Get version @@ -186,7 +171,7 @@ jobs: name: Release V${{ steps.vars.outputs.version }} tag_name: ${{ steps.vars.outputs.version }} body: V${{ steps.vars.outputs.version }} - prerelease: ${{ !endsWith(github.ref, 'master') }} + prerelease: false deploy: needs: [package-addon, release] @@ -196,9 +181,8 @@ jobs: - uses: actions/checkout@v6 - uses: actions/download-artifact@v7 with: - pattern: modular_tree_extension_* + name: modular_tree_extension path: extensions - merge-multiple: true - name: Get version id: vars run: | diff --git a/VERSION b/VERSION index b22d220..e04ee97 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5_5_1 +5_5_2 diff --git a/blender_manifest.toml b/blender_manifest.toml index 6b1f545..cc31a82 100644 --- a/blender_manifest.toml +++ b/blender_manifest.toml @@ -2,12 +2,12 @@ schema_version = "1.0.0" id = "modular_tree" name = "Modular Tree" -version = "5.5.1" +version = "5.5.2" website = "https://github.com/GoodPie/modular_tree" tagline = "Procedural node based 3D tree generation" maintainer = "GoodPie " type = "add-on" -blender_version_min = "4.3.0" +blender_version_min = "4.3.1" license = ["SPDX:GPL-3.0-or-later"] copyright = ["2021 MaximeHerpin", "2026 Brandyn Britton"] tags = ["Mesh", "Add Curve"] diff --git a/m_tree/pyproject.toml b/m_tree/pyproject.toml index fdf1851..32248e9 100644 --- a/m_tree/pyproject.toml +++ b/m_tree/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build" [project] name = "m_tree" -version = "5.5.1" +version = "5.5.2" description = "Procedural 3D tree generation library" requires-python = ">=3.11" diff --git a/pyproject.toml b/pyproject.toml index af66d10..ddd53d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "modular-tree" -version = "5.5.1" +version = "5.5.2" requires-python = ">=3.11" [dependency-groups]