From d0e5cfa95323f6a3745afe931d13ea5c092d4322 Mon Sep 17 00:00:00 2001 From: Vollkornaffe Date: Fri, 5 Jun 2026 19:19:31 +0200 Subject: [PATCH 1/3] chore: update versions that CI uses --- .github/workflows/build-package.yml | 8 ++++---- .github/workflows/bundle-extension.yml | 14 +++++++------- .github/workflows/release.yml | 16 ++++++++-------- .github/workflows/test.yml | 8 ++++---- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 0ef5c82..1b9ea59 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -9,16 +9,16 @@ permissions: jobs: build-package: - runs-on: [ubuntu-22.04] + runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v6 + - uses: astral-sh/setup-uv@v8 - name: Build tree_clipper run: uv build --package tree_clipper --no-sources --out-dir dist - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: tree-clipper-package path: dist/ \ No newline at end of file diff --git a/.github/workflows/bundle-extension.yml b/.github/workflows/bundle-extension.yml index 79ab102..69b188e 100644 --- a/.github/workflows/bundle-extension.yml +++ b/.github/workflows/bundle-extension.yml @@ -9,28 +9,28 @@ permissions: jobs: bundle-extension: - runs-on: [ubuntu-22.04] + runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v6 + - uses: astral-sh/setup-uv@v8 - name: Vendorize Core Logic run: uv run --only-group "build" python-vendorize - name: Get build script working-directory: packages/tree_clipper_addon/src - run: curl https://raw.githubusercontent.com/blender/blender/refs/tags/v5.0.0/scripts/addons_core/bl_pkg/cli/blender_ext.py --output blender_ext.py + run: curl https://raw.githubusercontent.com/blender/blender/refs/tags/v5.1.2/scripts/addons_core/bl_pkg/cli/blender_ext.py --output blender_ext.py - name: Build Blender extension bundles working-directory: packages/tree_clipper_addon/src/tree_clipper_addon - run: uv run --no-project --python 3.11 ../blender_ext.py build + run: uv run --no-project --python 3.13 ../blender_ext.py build - name: Generate index.json for easy updates working-directory: packages/tree_clipper_addon/src/tree_clipper_addon - run: uv run --no-project --python 3.11 ../blender_ext.py server-generate --repo-dir=./ + run: uv run --no-project --python 3.13 ../blender_ext.py server-generate --repo-dir=./ - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: tree-clipper-extension path: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbbed94..369e451 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,10 +18,10 @@ permissions: jobs: check-version: - runs-on: [ubuntu-22.04] + runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Get package version working-directory: packages/tree_clipper/ @@ -62,13 +62,13 @@ jobs: publish-package: if: ${{ github.event.inputs.pypi == 'true' }} needs: [build-package] - runs-on: [ubuntu-22.04] + runs-on: [ubuntu-lastest] environment: pypi permissions: id-token: write # required for Trusted Publishing steps: - name: Download dists - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v8 with: name: tree-clipper-package path: dist/ @@ -82,14 +82,14 @@ jobs: release-extension: needs: [bundle-extension] - runs-on: [ubuntu-22.04] + runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v6 - name: Clear release directory run: rm -rf release - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v8 with: name: tree-clipper-extension path: release/ @@ -104,7 +104,7 @@ jobs: } >> "$GITHUB_OUTPUT" - name: Release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v3 with: draft: ${{ github.event.inputs.draft }} prerelease: ${{ github.event.inputs.prerelease }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f89510a..2f25709 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: name: Check code style runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: astral-sh/ruff-action@v3 @@ -37,12 +37,12 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 with: lfs: true - name: Install uv - uses: astral-sh/setup-uv@v5 + uses: astral-sh/setup-uv@v8 - name: Install tree_clipper run: uv sync --all-extras @@ -52,7 +52,7 @@ jobs: run: uv run pytest continue-on-error: true - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: blend-files-from-failed-${{ matrix.os }} path: test_failures/*.blend From d8985b7adb56a7ae8045b5945c26dd454f37dd4f Mon Sep 17 00:00:00 2001 From: Vollkornaffe Date: Fri, 5 Jun 2026 19:23:06 +0200 Subject: [PATCH 2/3] fix: setup-uv version wrong? --- .github/workflows/build-package.yml | 2 +- .github/workflows/bundle-extension.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 1b9ea59..43f6fdb 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v8 + - uses: astral-sh/setup-uv@v8.2 - name: Build tree_clipper run: uv build --package tree_clipper --no-sources --out-dir dist diff --git a/.github/workflows/bundle-extension.yml b/.github/workflows/bundle-extension.yml index 69b188e..086d7fa 100644 --- a/.github/workflows/bundle-extension.yml +++ b/.github/workflows/bundle-extension.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v8 + - uses: astral-sh/setup-uv@v8.2 - name: Vendorize Core Logic run: uv run --only-group "build" python-vendorize diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f25709..9ab5c20 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: lfs: true - name: Install uv - uses: astral-sh/setup-uv@v8 + uses: astral-sh/setup-uv@v8.2 - name: Install tree_clipper run: uv sync --all-extras From 2003e2c8d0fc5689835afa582f7d0410048e8e6b Mon Sep 17 00:00:00 2001 From: Vollkornaffe Date: Fri, 5 Jun 2026 19:26:01 +0200 Subject: [PATCH 3/3] fix: need to use full version --- .github/workflows/build-package.yml | 2 +- .github/workflows/bundle-extension.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml index 43f6fdb..7c7b1f5 100644 --- a/.github/workflows/build-package.yml +++ b/.github/workflows/build-package.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v8.2 + - uses: astral-sh/setup-uv@v8.2.0 - name: Build tree_clipper run: uv build --package tree_clipper --no-sources --out-dir dist diff --git a/.github/workflows/bundle-extension.yml b/.github/workflows/bundle-extension.yml index 086d7fa..661c4f7 100644 --- a/.github/workflows/bundle-extension.yml +++ b/.github/workflows/bundle-extension.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v6 - - uses: astral-sh/setup-uv@v8.2 + - uses: astral-sh/setup-uv@v8.2.0 - name: Vendorize Core Logic run: uv run --only-group "build" python-vendorize diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ab5c20..753f2d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,7 +42,7 @@ jobs: lfs: true - name: Install uv - uses: astral-sh/setup-uv@v8.2 + uses: astral-sh/setup-uv@v8.2.0 - name: Install tree_clipper run: uv sync --all-extras