Cutter deps del

.github/workflows/ci.yml

@@ -45,14 +45,14 @@ jobs:
             cc-override: '/usr/bin/gcc-12'
             cxx-override: '/usr/bin/g++-12'
           - name: linux-x86_64 # main Appimage build
-            image: ubuntu:20.04
-            python-version: 3.6.x
+            image: ubuntu:24.04
+            python-version: 3.12.x
             system-deps: false
             package: true
             tarball: false
           - name: tarball
-            python-version: 3.6.x
-            image: ubuntu:20.04
+            python-version: 3.12.x
+            image: ubuntu:24.04
             system-deps: false
             package: false
             tarball: true
@@ -126,20 +126,26 @@ jobs:
                              llvm-8
           ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config
         fi
-        if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:20.04" ]; then
+        if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:24.04" ]; then
           # install additional packages needed for appimage
           apt-get -y install libxcb1-dev \
                              libxkbcommon-dev \
                              libxcb-*-dev \
                              libegl1
         fi
-        if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then
+        if [ "${{ matrix.image }}" = "ubuntu:24.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then
           # install additional packages needed for appimage
           apt-get -y install libclang-12-dev \
                              llvm-12 \
                              libsm6 \
                              libwayland-dev  \
                              libgl1-mesa-dev
+			     lsb-release \
+                             wget \
+                             software-properties-common
+          curl -O https://apt.llvm.org/llvm.sh
+          chmod +x llvm.sh
+          ./llvm.sh 20
         fi
         if [ "${{ matrix.image }}" = "ubuntu:18.04" ] && [ "${{ matrix.system-deps }}" = "true" ]; then
           apt-get -y install qt5-default \
@@ -169,7 +175,7 @@ jobs:
         python3 --version
         which python3
         # https://github.com/rizinorg/cutter/runs/7170222817?check_suite_focus=true
-        python3 -m pip install meson==0.61.5
+        python3 -m pip install meson # ==0.61.5
     - name: Prepare package id
       shell: bash
       run: |
@@ -188,6 +194,7 @@ jobs:
         then
           CUTTER_QT="${{ matrix.qt-major }}" scripts/fetch_deps.sh
           . cutter-deps/env.sh
+          ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
           export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH"
         fi
         set -e #TODO: move to top once cutter-deps doesn't fail
@@ -437,6 +444,7 @@ jobs:
         brew bundle
         brew install pkg-config || brew link --overwrite pkgconf
         brew install kadwanev/brew/retry
+        brew install llvm@20 && brew link llvm@20
     - name: py dependencies
       run: |
         #python3 -m pip install -U pip==21.3.1
@@ -459,8 +467,9 @@ jobs:
       run: |
         export MACOSX_DEPLOYMENT_TARGET=10.15
         scripts/fetch_deps.sh
-        install_name_tool -delete_rpath /Users/runner/work/cutter-deps/cutter-deps/qt/lib ./cutter-deps/pyside/lib/libpyside6.cpython-312-darwin.6.7.2.dylib #TODO: do this in cutter-deps
+        install_name_tool -delete_rpath /Users/runner/work/cutter-deps/cutter-deps/qt/lib ./cutter-deps/pyside/lib/libpyside6.cpython-312-darwin.6.11.dylib #TODO: do this in cutter-deps
         source cutter-deps/env.sh
+        ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
         set -euo pipefail
         export PATH=/usr/local/opt/llvm/bin:$PATH
         mkdir build
@@ -503,6 +512,7 @@ jobs:
       run: |
         pip install ninja
         scripts/fetch_deps.sh
+        ln -sf "$PWD/cutter-deps/pyside/share/PySide6/"* "$PWD/cutter-deps/pyside/"
         choco install winflexbison3
     - name: windows cmake
       if: contains(matrix.os, 'windows')