From 8440a6a5ddcb3284e68312d2acba14399d24c18a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 29 Mar 2024 02:09:51 +0400
Subject: [PATCH] CI: switch openSUSE build to Qt6

---
 .github/workflows/nightly-opensuse-qt6.yml | 33 ----------------------
 .github/workflows/nightly-opensuse.yml     |  1 +
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 .github/workflows/nightly-opensuse-qt6.yml

diff --git a/.github/workflows/nightly-opensuse-qt6.yml b/.github/workflows/nightly-opensuse-qt6.yml
deleted file mode 100644
index cd286d5db..000000000
--- a/.github/workflows/nightly-opensuse-qt6.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: nightly-opensuse-qt6
-
-on:
-  schedule:
-    - cron: "32 2 * * *"
-  workflow_dispatch:
-
-env:
-  BUILDDIR: /build
-  SRCDIR: ${{ github.workspace }}
-  CMAKE_ARGS: |
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_QT6=ON
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: docker://opensuse/tumbleweed
-      options: --tmpfs /build:rw --user 0:0
-    steps:
-      - name: "prepare git"
-        shell: bash
-        run: zypper --non-interactive in git-core jq curl
-      - name: "prepare source"
-        uses: calamares/actions/generic-checkout@v5
-      - name: "install dependencies"
-        shell: bash
-        run: ./ci/deps-opensuse-qt6.sh
-      - name: "build"
-        shell: bash
-        run: ./ci/build.sh
diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
index 5b742b704..49c155a77 100644
--- a/.github/workflows/nightly-opensuse.yml
+++ b/.github/workflows/nightly-opensuse.yml
@@ -15,6 +15,7 @@ env:
     -DBUILD_TESTING=ON
     -DBUILD_APPSTREAM=ON
     -DBUILD_APPDATA=ON
+    -DWITH_QT6=ON
 
 jobs:
   build: