From 8a4afa1db265788e540e53c2c1f162fa3c38e250 Mon Sep 17 00:00:00 2001 From: rejbasket <39080670+rejbasket@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:44:54 +0100 Subject: Rejbasket/update macos cloud build (#3291) * upgraded macos build to macos-13 upgraded wxpython to 4.2.2 for linux * add missing linux libs for update to wxpython --------- Authored by: rejbasket --- .github/workflows/build.yml | 4 ++-- bin/build-python | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0b58cb5..4ae9c6f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: python -m pip install pycairo python -m pip install PyGObject - python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.2.1-cp39-cp39-linux_x86_64.whl + python -m pip install https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.2.2-cp39-cp39-linux_x86_64.whl python -m pip install -r requirements.txt # for networkx @@ -227,7 +227,7 @@ jobs: name: inkstitch-windows64 path: artifacts macx86: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: diff --git a/bin/build-python b/bin/build-python index e6fcf667..4df27e2d 100755 --- a/bin/build-python +++ b/bin/build-python @@ -27,6 +27,8 @@ fi if [ "$BUILD" = "linux" ]; then pyinstaller_args+="--hidden-import gi.repository.Gtk " + pyinstaller_args+="--add-binary /lib/x86_64-linux-gnu/libcrypt.so.1:. " + pyinstaller_args+="--add-binary /lib/x86_64-linux-gnu/libnsl.so.1:. " fi -- cgit v1.2.3