From 108acf1cd0cf61c31d6e83eda710b62f9b0081f5 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Tue, 4 Aug 2026 12:07:55 +0500 Subject: [PATCH] build_rocky: rely on uv for providing Python --- .github/workflows/build_rocky.yml | 6 ++---- .github/workflows/build_rocky_arm.yml | 5 ++--- src/bonsaiviewer-autodesk/packaging/build.py | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_rocky.yml b/.github/workflows/build_rocky.yml index aad496678d..b07aaa4ab4 100644 --- a/.github/workflows/build_rocky.yml +++ b/.github/workflows/build_rocky.yml @@ -23,16 +23,14 @@ jobs: # --enablerepo=crb: libstdc++-static (libsupc++.a, needed by the # bundled FLTK link) lives in Rocky's CodeReady Builder repo, which # is disabled by default. - dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \ + dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake \ bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel \ sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel \ readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \ findutils xz byacc patchelf libxkbcommon-devel \ - python3.11 python3.11-pip \ dbus-devel \ libXext-devel libXinerama-devel libXcursor-devel libXrender-devel \ libXfixes-devel libXft-devel pango-devel cairo-devel libstdc++-static - python3 -m pip install aqtinstall git config --global --add safe.directory '*' - name: Install Rust @@ -118,7 +116,7 @@ jobs: # connector.json into dist/autodesk/. Same on-disk shape as the # old PyInstaller flow so the symlink + zip steps below # continue to work unchanged. - python3.11 src/bonsaiviewer-autodesk/packaging/build.py + uv run src/bonsaiviewer-autodesk/packaging/build.py autodesk_connector_dir="$PWD/src/bonsaiviewer-autodesk/dist/autodesk" test -d "$autodesk_connector_dir" diff --git a/.github/workflows/build_rocky_arm.yml b/.github/workflows/build_rocky_arm.yml index adfe9865f5..93b5305dd8 100644 --- a/.github/workflows/build_rocky_arm.yml +++ b/.github/workflows/build_rocky_arm.yml @@ -35,7 +35,7 @@ jobs: # --enablerepo=crb: libstdc++-static (libsupc++.a, needed by the # bundled FLTK link) lives in Rocky's CodeReady Builder repo, which # is disabled by default. - dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake python3 python3-pip \ + dnf install -y --enablerepo=crb gcc gcc-c++ git autoconf automake bison make zip cmake \ bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel \ sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel \ readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \ @@ -43,7 +43,6 @@ jobs: dbus-devel \ libXext-devel libXinerama-devel libXcursor-devel libXrender-devel \ libXfixes-devel libXft-devel pango-devel cairo-devel libstdc++-static - python3 -m pip install aqtinstall git config --global --add safe.directory '*' - name: Install Rust @@ -129,7 +128,7 @@ jobs: # connector.json into dist/autodesk/. Same on-disk shape as the # old PyInstaller flow so the symlink + zip steps below # continue to work unchanged. - python3 src/bonsaiviewer-autodesk/packaging/build.py + uv run src/bonsaiviewer-autodesk/packaging/build.py autodesk_connector_dir="$PWD/src/bonsaiviewer-autodesk/dist/autodesk" test -d "$autodesk_connector_dir" diff --git a/src/bonsaiviewer-autodesk/packaging/build.py b/src/bonsaiviewer-autodesk/packaging/build.py index 80206d8caa..0c20e81b12 100644 --- a/src/bonsaiviewer-autodesk/packaging/build.py +++ b/src/bonsaiviewer-autodesk/packaging/build.py @@ -1,3 +1,5 @@ +# /// script +# /// """Build the Autodesk connector bundle for the current OS. Runs `cargo build --release` and packages the resulting binary +