From d875167ba06bf2387835b4ea8c72801a027c52a9 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sat, 25 Apr 2026 17:48:54 +0500 Subject: [PATCH 01/30] test script with my url --- scripts/fetch_deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index cac15f1ebc..534881511b 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -5,7 +5,7 @@ set -e cd $(dirname "${BASH_SOURCE[0]}")/.. mkdir -p cutter-deps && cd cutter-deps -DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/v16 +DEPS_BASE_URL=https://github.com/premades/cutter-deps/releases/download/v2 if [ "$CUTTER_QT" == "5" ]; then DEPS_FILE_linux_x86_64=cutter-deps-q5-linux-x86_64.tar.gz @@ -21,7 +21,7 @@ DEPS_FILE_macos_x86_64=cutter-deps-macos-x86_64.tar.gz DEPS_SHA256_macos_x86_64=bcdc214e34dc3fd720327ad42e03fe3ec996ca28a9987e99898f149a65299a8c DEPS_FILE_macos_arm64=cutter-deps-macos-arm64.tar.gz -DEPS_SHA256_macos_arm64=aa3f5ae91b93c5176d6bd4313af0888a2b6dcdaa2ef1750dd7e2f98156882e0f +DEPS_SHA256_macos_arm64=7f33698372f6614bab9bcb62fb160d2c755fafc99316e83551c8b5422d11acd3 DEPS_FILE_win_x86_64=cutter-deps-win-x86_64.tar.gz DEPS_SHA256_win_x86_64=710e40cf8329205d09535cc56a9fb155a56ff1a1ca112145864382fb3d4e8160 From eec204a905fc6f1015d0161e464cbfee862a5900 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sat, 25 Apr 2026 17:53:59 +0500 Subject: [PATCH 02/30] fix qt version in dylib --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e49c87ae77..44e0c838c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -459,7 +459,7 @@ 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 set -euo pipefail export PATH=/usr/local/opt/llvm/bin:$PATH From 32eef93c0a9cce3c02920034e352f183ca9199a9 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:06:39 +0500 Subject: [PATCH 03/30] symlink to typesystems test --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44e0c838c1..091e129064 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -461,6 +461,7 @@ jobs: 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.11.dylib #TODO: do this in cutter-deps source cutter-deps/env.sh + ln -sf "$PWD/cutter-deps/pyside/share/PySide6/typesystems" "$PWD/cutter-deps/pyside/typesystems" set -euo pipefail export PATH=/usr/local/opt/llvm/bin:$PATH mkdir build From 5b8ef8b8657fbfc770dd9484d9214d6e559e509e Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:10:30 +0500 Subject: [PATCH 04/30] symlink to entire dir test --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 091e129064..ee79525f20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -461,7 +461,7 @@ jobs: 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.11.dylib #TODO: do this in cutter-deps source cutter-deps/env.sh - ln -sf "$PWD/cutter-deps/pyside/share/PySide6/typesystems" "$PWD/cutter-deps/pyside/typesystems" + 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 From 8cd929a01268f2448a23c2ec27ca9230a40cfa02 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sat, 25 Apr 2026 18:19:39 +0500 Subject: [PATCH 05/30] llvm@20 --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee79525f20..9f1be3598d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,6 +437,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 From d38ca546f67215786a6fb1d72d87e266522cb710 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 18:09:10 +0500 Subject: [PATCH 06/30] wip --- scripts/fetch_deps.sh | 8 ++++---- src/plugins/PluginManager.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/fetch_deps.sh b/scripts/fetch_deps.sh index 534881511b..1a6767f97b 100755 --- a/scripts/fetch_deps.sh +++ b/scripts/fetch_deps.sh @@ -13,18 +13,18 @@ if [ "$CUTTER_QT" == "5" ]; then DEPS_BASE_URL=https://github.com/rizinorg/cutter-deps/releases/download/qt5-v17 else DEPS_FILE_linux_x86_64=cutter-deps-linux-x86_64.tar.gz - DEPS_SHA256_linux_x86_64=f63c5af2d9872bc6538a94c839d6ef6645c7630c42cff30f1d9da8eefd9eb040 + DEPS_SHA256_linux_x86_64=019b12730b55d57c8352b1b2603ce009b3c837cb78d1f7594d557ce26815fa2e fi echo $DEPS_SHA256_linux_x86_64 DEPS_FILE_macos_x86_64=cutter-deps-macos-x86_64.tar.gz -DEPS_SHA256_macos_x86_64=bcdc214e34dc3fd720327ad42e03fe3ec996ca28a9987e99898f149a65299a8c +DEPS_SHA256_macos_x86_64=4713ca125fdb56ff788aa50b94abf12af1342fd8bb5851c1f79a905431144699 DEPS_FILE_macos_arm64=cutter-deps-macos-arm64.tar.gz -DEPS_SHA256_macos_arm64=7f33698372f6614bab9bcb62fb160d2c755fafc99316e83551c8b5422d11acd3 +DEPS_SHA256_macos_arm64=ee7ae89c06c190464cd84386fe1683147cf9d93a2bab0113a0250aa5d7f124f7 DEPS_FILE_win_x86_64=cutter-deps-win-x86_64.tar.gz -DEPS_SHA256_win_x86_64=710e40cf8329205d09535cc56a9fb155a56ff1a1ca112145864382fb3d4e8160 +DEPS_SHA256_win_x86_64=0dbd73f5f83f7bc40aef6dd3d5254d7a7151d07abdaf08d84150c1ec37b520e2 ARCH=x86_64 diff --git a/src/plugins/PluginManager.cpp b/src/plugins/PluginManager.cpp index d1c5465da5..645b1779d2 100644 --- a/src/plugins/PluginManager.cpp +++ b/src/plugins/PluginManager.cpp @@ -216,9 +216,9 @@ CutterPlugin *PluginManager::loadPythonPlugin(const char *moduleName) PythonToCppFunc pythonToCpp = Shiboken::Conversions::isPythonToCppPointerConvertible( # if QT_VERSION < QT_VERSION_CHECK(6, 2, 0) - reinterpret_cast(SbkCutterBindingsTypes[SBK_CUTTERPLUGIN_IDX]), + reinterpret_cast(SbkCutterBindingsTypes[SBK_CutterPlugin_IDX]), # else - reinterpret_cast(SbkCutterBindingsTypeStructs)[SBK_CUTTERPLUGIN_IDX], + reinterpret_cast(SbkCutterBindingsTypeStructs)[SBK_CutterPlugin_IDX], # endif pluginObject); if (!pythonToCpp) { From 7b401c7b5ff92b4063bd10bb379bf3b38514bf61 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 19:47:50 +0500 Subject: [PATCH 07/30] symlinks + python version up in linux --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f1be3598d..7865a09aa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build image: ubuntu:20.04 - python-version: 3.6.x + python-version: 3.12.x system-deps: false package: true tarball: false @@ -188,6 +188,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 @@ -505,6 +506,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') From ee8009cee1cc5086661bef593875b1eaa881db15 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 20:00:11 +0500 Subject: [PATCH 08/30] update runner to 22 (should do it 24?) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7865a09aa5..5d51bbe833 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,7 @@ jobs: cc-override: '/usr/bin/gcc-12' cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build - image: ubuntu:20.04 + image: ubuntu:22.04 python-version: 3.12.x system-deps: false package: true From 5eee5bad01282ffd2f7741792665db2f4ef9bfda Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 20:13:24 +0500 Subject: [PATCH 09/30] update llvm version --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d51bbe833..4e772304c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,8 +51,8 @@ jobs: package: true tarball: false - name: tarball - python-version: 3.6.x - image: ubuntu:20.04 + python-version: 3.12.x + image: ubuntu:22.04 system-deps: false package: false tarball: true @@ -148,8 +148,8 @@ jobs: qttools5-dev-tools fi if [ "${{ matrix.image }}" = "ubuntu:22.04" ]; then - apt-get -y install libclang-12-dev \ - llvm-12 \ + apt-get -y install libclang-20-dev \ + llvm-20 \ qt6-base-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ @@ -157,8 +157,8 @@ jobs: libqt6core5compat6-dev \ libqt6svgwidgets6 \ qt6-l10n-tools \ - gcc-12 \ - g++-12 + gcc-14 \ + g++-14 fi - uses: actions/setup-python@v6 if: matrix.system-deps == false From 35eed5fa95e6c883ed0fff234d9367a87dd39820 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 20:45:21 +0500 Subject: [PATCH 10/30] update llvm version --- .github/workflows/ci.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e772304c2..e3b019de52 100644 --- a/.github/workflows/ci.yml +++ b/.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:22.04 + image: ubuntu:24.04 python-version: 3.12.x system-deps: false package: true tarball: false - name: tarball python-version: 3.12.x - image: ubuntu:22.04 + image: ubuntu:24.04 system-deps: false package: false tarball: true @@ -126,14 +126,14 @@ 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:22.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:22.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage apt-get -y install libclang-12-dev \ llvm-12 \ @@ -147,18 +147,19 @@ jobs: qttools5-dev \ qttools5-dev-tools fi - if [ "${{ matrix.image }}" = "ubuntu:22.04" ]; then - apt-get -y install libclang-20-dev \ - llvm-20 \ - qt6-base-dev \ + if [ "${{ matrix.image }}" = "ubuntu:24.04" ]; then + apt-get -y install qt6-base-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ libqt6svg6-dev \ libqt6core5compat6-dev \ libqt6svgwidgets6 \ qt6-l10n-tools \ - gcc-14 \ - g++-14 + gcc-13 \ + g++-13 + curl -O https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + sudo ./llvm.sh 18 fi - uses: actions/setup-python@v6 if: matrix.system-deps == false From e78b8cd2c12f7783ff83b474ce7c3a6349088e99 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:01:04 +0500 Subject: [PATCH 11/30] remove sudo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e3b019de52..3631eb416a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,7 +159,7 @@ jobs: g++-13 curl -O https://apt.llvm.org/llvm.sh chmod +x llvm.sh - sudo ./llvm.sh 18 + ./llvm.sh 18 fi - uses: actions/setup-python@v6 if: matrix.system-deps == false From ffe3d62eeb349efaf1862dd0bfa7501cfe26ef5f Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:07:35 +0500 Subject: [PATCH 12/30] add lsb-release --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3631eb416a..dbaf05c712 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,10 +156,11 @@ jobs: libqt6svgwidgets6 \ qt6-l10n-tools \ gcc-13 \ - g++-13 + g++-13 \ + lsb-release curl -O https://apt.llvm.org/llvm.sh chmod +x llvm.sh - ./llvm.sh 18 + ./llvm.sh 20 fi - uses: actions/setup-python@v6 if: matrix.system-deps == false From 49d680aae707b6ea8b3d3d36657aca81ea8dcc5d Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:09:47 +0500 Subject: [PATCH 13/30] add llvm dependencies --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbaf05c712..47d33b695a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,9 @@ jobs: qt6-l10n-tools \ gcc-13 \ g++-13 \ - lsb-release + lsb-release \ + wget \ + software-properties-common curl -O https://apt.llvm.org/llvm.sh chmod +x llvm.sh ./llvm.sh 20 From 4b48b09a2e600117f4e1eeb119ed080543a9e37f Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:37:31 +0500 Subject: [PATCH 14/30] get rid of trailing space --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47d33b695a..1c9a83c5fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: qt6-l10n-tools \ gcc-13 \ g++-13 \ - lsb-release \ + lsb-release \ wget \ software-properties-common curl -O https://apt.llvm.org/llvm.sh From 6d7ed63be965a9509baa51f809e5c65b8ff5862b Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:45:45 +0500 Subject: [PATCH 15/30] update meson --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c9a83c5fa..92ec71e7ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,8 @@ 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 + pip install meson - name: Prepare package id shell: bash run: | From 13f790381cfdcde515ab118c597d250f90c5cf9f Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:48:56 +0500 Subject: [PATCH 16/30] update meson --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92ec71e7ae..720494b11e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,8 +173,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 - pip install meson + python3 -m pip install meson # ==0.61.5 - name: Prepare package id shell: bash run: | From d112249fa0fba758d0d9b9a1b73f7a627bacc55e Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:55:55 +0500 Subject: [PATCH 17/30] gcc-13 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 720494b11e..2c21ace47e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,8 @@ jobs: system-deps: true package: false tarball: false - cc-override: '/usr/bin/gcc-12' - cxx-override: '/usr/bin/g++-12' + cc-override: '/usr/bin/gcc-13' + cxx-override: '/usr/bin/g++-13' - name: linux-x86_64 # main Appimage build image: ubuntu:24.04 python-version: 3.12.x From 28dd14aa7426f78616fe0cedc30501dc885d9581 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:59:05 +0500 Subject: [PATCH 18/30] remove overrides --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c21ace47e..841cb2c390 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,6 @@ jobs: system-deps: true package: false tarball: false - cc-override: '/usr/bin/gcc-13' - cxx-override: '/usr/bin/g++-13' - name: linux-x86_64 # main Appimage build image: ubuntu:24.04 python-version: 3.12.x From db86ba75445f4158c72ba8335e6f6c49f87ea67c Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:14:57 +0500 Subject: [PATCH 19/30] fix versions --- .github/workflows/ci.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 841cb2c390..27d3a078df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,8 @@ jobs: system-deps: true package: false tarball: false + cc-override: '/usr/bin/gcc-12' + cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build image: ubuntu:24.04 python-version: 3.12.x @@ -124,14 +126,14 @@ jobs: llvm-8 ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config fi - if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:22.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:22.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 \ @@ -145,22 +147,18 @@ jobs: qttools5-dev \ qttools5-dev-tools fi - if [ "${{ matrix.image }}" = "ubuntu:24.04" ]; then - apt-get -y install qt6-base-dev \ + if [ "${{ matrix.image }}" = "ubuntu:22.04" ]; then + apt-get -y install libclang-12-dev \ + llvm-12 \ + qt6-base-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ libqt6svg6-dev \ libqt6core5compat6-dev \ libqt6svgwidgets6 \ qt6-l10n-tools \ - gcc-13 \ - g++-13 \ - lsb-release \ - wget \ - software-properties-common - curl -O https://apt.llvm.org/llvm.sh - chmod +x llvm.sh - ./llvm.sh 20 + gcc-12 \ + g++-12 fi - uses: actions/setup-python@v6 if: matrix.system-deps == false From aff858288907d5a875abc2ff78c6024a91b5e144 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:17:58 +0500 Subject: [PATCH 20/30] llvm 20 --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 27d3a078df..861d79f060 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -139,7 +139,11 @@ jobs: llvm-12 \ libsm6 \ libwayland-dev \ - libgl1-mesa-dev + libgl1-mesa-dev \ + wget \ + software-properties-common \ + lsb-release + wget https://apt.llvm.org/llvm.sh -O /tmp/llvm-install.sh; chmod +x /tmp/llvm-install.sh; /tmp/llvm-install.sh 20 fi if [ "${{ matrix.image }}" = "ubuntu:18.04" ] && [ "${{ matrix.system-deps }}" = "true" ]; then apt-get -y install qt5-default \ From 0e19293bf99eeecbfdc18d06829cbd15f552c94e Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Sun, 26 Apr 2026 23:21:49 +0500 Subject: [PATCH 21/30] remove llvm-12 --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 861d79f060..eead11639a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,9 +135,7 @@ jobs: fi 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 \ + apt-get -y install libsm6 \ libwayland-dev \ libgl1-mesa-dev \ wget \ From 16ef9e1a52410040d305e4b313fdbc14917e8f12 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 00:20:40 +0500 Subject: [PATCH 22/30] back down to 20.04 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eead11639a..cc1e12c694 100644 --- a/.github/workflows/ci.yml +++ b/.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:24.04 + image: ubuntu:20.04 python-version: 3.12.x system-deps: false package: true tarball: false - name: tarball python-version: 3.12.x - image: ubuntu:24.04 + image: ubuntu:20.04 system-deps: false package: false tarball: true @@ -126,14 +126,14 @@ jobs: llvm-8 ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config fi - if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:24.04" ]; then + if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:20.04" ]; then # install additional packages needed for appimage apt-get -y install libxcb1-dev \ libxkbcommon-dev \ libxcb-*-dev \ libegl1 fi - if [ "${{ matrix.image }}" = "ubuntu:24.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then + if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage apt-get -y install libsm6 \ libwayland-dev \ From 166f3826d05377d67a9b52b4b975e6eec27fec9c Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 00:23:55 +0500 Subject: [PATCH 23/30] to 21.04 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc1e12c694..7cfb78814f 100644 --- a/.github/workflows/ci.yml +++ b/.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 + image: ubuntu:21.04 python-version: 3.12.x system-deps: false package: true tarball: false - name: tarball python-version: 3.12.x - image: ubuntu:20.04 + image: ubuntu:21.04 system-deps: false package: false tarball: true @@ -126,14 +126,14 @@ 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:21.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:21.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage apt-get -y install libsm6 \ libwayland-dev \ From 6828ead1bcf143820c1e1e1c60733e5b8ecc4570 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 00:31:04 +0500 Subject: [PATCH 24/30] to 20.04 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cfb78814f..99857cb3af 100644 --- a/.github/workflows/ci.yml +++ b/.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:21.04 + image: ubuntu:20.04 python-version: 3.12.x system-deps: false package: true tarball: false - name: tarball python-version: 3.12.x - image: ubuntu:21.04 + image: ubuntu:20.04 system-deps: false package: false tarball: true @@ -126,14 +126,14 @@ jobs: llvm-8 ln -s /usr/bin/llvm-config-8 /usr/bin/llvm-config fi - if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || [ "${{ matrix.image }}" = "ubuntu:21.04" ]; then + if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || ([ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]); then # install additional packages needed for appimage apt-get -y install libxcb1-dev \ libxkbcommon-dev \ libxcb-*-dev \ libegl1 fi - if [ "${{ matrix.image }}" = "ubuntu:21.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then + if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage apt-get -y install libsm6 \ libwayland-dev \ From c477188c236eb18be4a52795a1b0ef0d258e048c Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 00:37:17 +0500 Subject: [PATCH 25/30] py version 3.11 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99857cb3af..7a7b328048 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,12 +46,12 @@ jobs: cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build image: ubuntu:20.04 - python-version: 3.12.x + python-version: 3.11.x system-deps: false package: true tarball: false - name: tarball - python-version: 3.12.x + python-version: 3.11.x image: ubuntu:20.04 system-deps: false package: false From 92bac3e79b9aaf39e434329673453546c21fb9d8 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 00:50:49 +0500 Subject: [PATCH 26/30] py version 3.11 --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a7b328048..2f59997da3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,12 +46,10 @@ jobs: cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build image: ubuntu:20.04 - python-version: 3.11.x system-deps: false package: true tarball: false - name: tarball - python-version: 3.11.x image: ubuntu:20.04 system-deps: false package: false @@ -131,7 +129,8 @@ jobs: apt-get -y install libxcb1-dev \ libxkbcommon-dev \ libxcb-*-dev \ - libegl1 + libegl1 \ + python3.11 fi if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage From c4844e77b61e70e804e6119dc9510d0150503828 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 01:04:49 +0500 Subject: [PATCH 27/30] python3 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f59997da3..90e7af6b7b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -130,7 +130,7 @@ jobs: libxkbcommon-dev \ libxcb-*-dev \ libegl1 \ - python3.11 + python3 fi if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage From a3c8a84312cecca7ac520784b22c523b4c547ce3 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 01:13:18 +0500 Subject: [PATCH 28/30] ubuntu 22.04 --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90e7af6b7b..942ac22e04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,12 +45,12 @@ jobs: cc-override: '/usr/bin/gcc-12' cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build - image: ubuntu:20.04 + image: ubuntu:22.04 system-deps: false package: true tarball: false - name: tarball - image: ubuntu:20.04 + image: ubuntu:22.04 system-deps: false package: false tarball: true @@ -124,15 +124,14 @@ 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" ] && [ "${{ matrix.system-deps }}" = "false" ]); then + if [ "${{ matrix.image }}" = "ubuntu:18.04" ] || ([ "${{ matrix.image }}" = "ubuntu:22.04" ] && [ "${{ matrix.system-deps }}" = "false" ]); then # install additional packages needed for appimage apt-get -y install libxcb1-dev \ libxkbcommon-dev \ libxcb-*-dev \ libegl1 \ - python3 fi - if [ "${{ matrix.image }}" = "ubuntu:20.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then + if [ "${{ matrix.image }}" = "ubuntu:22.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage apt-get -y install libsm6 \ libwayland-dev \ @@ -148,7 +147,7 @@ jobs: qttools5-dev \ qttools5-dev-tools fi - if [ "${{ matrix.image }}" = "ubuntu:22.04" ]; then + if [ "${{ matrix.image }}" = "ubuntu:22.04" ] && [ "${{ matrix.system-deps }}" = "true" ]; then apt-get -y install libclang-12-dev \ llvm-12 \ qt6-base-dev \ From 00fe5f00fc46d86c175a7ea0358b90112024ac7d Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 01:18:51 +0500 Subject: [PATCH 29/30] remove blackslash --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 942ac22e04..80c8acdae9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,7 +129,7 @@ jobs: apt-get -y install libxcb1-dev \ libxkbcommon-dev \ libxcb-*-dev \ - libegl1 \ + libegl1 fi if [ "${{ matrix.image }}" = "ubuntu:22.04" ] && [ "${{ matrix.system-deps }}" = "false" ]; then # install additional packages needed for appimage From 276a72a034d03161eac59b502ca16d49ebbcede9 Mon Sep 17 00:00:00 2001 From: PremadeS <128969155+PremadeS@users.noreply.github.com> Date: Mon, 27 Apr 2026 01:23:48 +0500 Subject: [PATCH 30/30] python 3.12 --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80c8acdae9..76a2729377 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,11 +46,13 @@ jobs: cxx-override: '/usr/bin/g++-12' - name: linux-x86_64 # main Appimage build image: ubuntu:22.04 + python-version: 3.12.x system-deps: false package: true tarball: false - name: tarball image: ubuntu:22.04 + python-version: 3.12.x system-deps: false package: false tarball: true