Appveyor config update and CI cleanup.

rizinorg · Jul 14, 2024 · 0a519df · 0a519df
1 parent 3640866
commit 0a519df
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -25,7 +25,6 @@ install:
   - cmd: python -m pip install meson ninja
   - ps: choco install winflexbison3
   # Artifacts
-  - cmd: set "ARTIFACT_NAME=%PACKAGE_NAME%.zip"
   - cmd: set "ARTIFACT_PATH=build\%ARTIFACT_NAME%"
 
 before_build:
@@ -40,6 +39,7 @@ build_script:
   - cmd: "cmake
        -DCMAKE_BUILD_TYPE=Release
        -DCUTTER_USE_BUNDLED_RIZIN=ON
+       -DCUTTER_QT6=ON
        -DCUTTER_ENABLE_PYTHON=ON
        -DCUTTER_ENABLE_PYTHON_BINDINGS=ON
        -DCUTTER_ENABLE_PACKAGING=ON

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,24 +29,13 @@ jobs:
       matrix:
         name: [
             linux-x86_64,
-            #linux-x86_64-qt5,
-            #linux-x86_64-system-deps,
             linux-x86_64-qt6-system-deps,
             tarball
         ]
         include:
           - qt-major: 6
             cc-override: default
             cxx-override: default
-          #- name: linux-x86_64-system-deps # ensure that Cutter can be built at least in basic config on Ubuntu 18.04 using sytem libraries
-          #  image: ubuntu:18.04
-          #  python-version: 3.6.x
-          #  system-deps: true
-          #  package: false
-          #  tarball: false
-          #  cc-override: '/usr/bin/gcc-7'
-          #  cxx-override: '/usr/bin/g++-7'
-          #  qt-major: 5
           - name: linux-x86_64-qt6-system-deps # ensure that Cutter can be built at least in basic config on Ubuntu 22.04 using sytem libraries
             image: ubuntu:22.04
             python-version: 3.10.x
@@ -55,13 +44,6 @@ jobs:
             tarball: false
             cc-override: '/usr/bin/gcc-12'
             cxx-override: '/usr/bin/g++-12'
-          #- name: linux-x86_64-qt5 # qt5 Appimage build for increased compatibility with older distros
-          #  image: ubuntu:18.04
-          #  python-version: 3.6.x
-          #  system-deps: false
-          #  package: true
-          #  tarball: false
-          #  qt-major: 5
           - name: linux-x86_64 # main Appimage build
             image: ubuntu:20.04
             python-version: 3.6.x