From 6cb4b25788dd2178c4b1e153b371b5514974849c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 3 Mar 2024 20:42:42 +0100
Subject: [PATCH] CI: switch around images for CI builds

- KDE neon user mixes KF5 and KF6 and I can't get the dependencies to install
- KDE neon unstable was not actually used
- Fedora seems more stable for CI purposes.
---
 .github/workflows/nightly-neon-unstable.yml | 29 ---------------
 .github/workflows/nightly-neon.yml          | 41 ---------------------
 .github/workflows/push.yml                  | 10 +++--
 3 files changed, 6 insertions(+), 74 deletions(-)
 delete mode 100644 .github/workflows/nightly-neon-unstable.yml
 delete mode 100644 .github/workflows/nightly-neon.yml

diff --git a/.github/workflows/nightly-neon-unstable.yml b/.github/workflows/nightly-neon-unstable.yml
deleted file mode 100644
index f5a2a693c..000000000
--- a/.github/workflows/nightly-neon-unstable.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: nightly-neon-unstable
-
-on:
-  schedule:
-    - cron: "59 23 * * *"
-  workflow_dispatch:
-
-env:
-  BUILDDIR: /build
-  SRCDIR: ${{ github.workspace }}
-  CMAKE_ARGS: |
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DCMAKE_BUILD_TYPE=Debug
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: docker://kdeneon/plasma:unstable
-      options: --tmpfs /build:rw --user 0:0
-    steps:
-      - name: "prepare source"
-        uses: calamares/actions/generic-checkout@v5
-      - name: "install dependencies"
-        shell: bash
-        run: ./ci/deps-neon.sh
-      - name: "build"
-        shell: bash
-        run: ./ci/build.sh
diff --git a/.github/workflows/nightly-neon.yml b/.github/workflows/nightly-neon.yml
deleted file mode 100644
index 35ccf488a..000000000
--- a/.github/workflows/nightly-neon.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: nightly-neon
-
-on:
-  schedule:
-    - cron: "52 23 * * *"
-  workflow_dispatch:
-
-env:
-  BUILDDIR: /build
-  SRCDIR: ${{ github.workspace }}
-  CMAKE_ARGS: |
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DCMAKE_BUILD_TYPE=Debug
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: docker://kdeneon/plasma:user
-      options: --tmpfs /build:rw --user 0:0
-    steps:
-      - name: "prepare source"
-        uses: calamares/actions/generic-checkout@v5
-      - name: "install dependencies"
-        shell: bash
-        run: ./ci/deps-neon.sh
-      - name: "build"
-        shell: bash
-        run: ./ci/build.sh
-      - name: "Calamares: archive"
-        working-directory: ${{ env.BUILDDIR }}
-        run: |
-          DESTDIR=${{ env.BUILDDIR }}/stage ninja install
-          tar czf calamares.tar.gz stage
-      - name: "Calamares: upload"
-        uses: actions/upload-artifact@v3
-        with:
-          name: calamares-tarball
-          path: ${{ env.BUILDDIR }}/calamares.tar.gz
-          if-no-files-found: error
-          retention-days: 7
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 858d7bf42..47a4a72bf 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -15,24 +15,26 @@ env:
   BUILDDIR: /build
   SRCDIR: ${{ github.workspace }}
   CMAKE_ARGS: |
-    -DWEBVIEW_FORCE_WEBKIT=1
     -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-    -DWITH_PYTHONQT=OFF
     -DCMAKE_BUILD_TYPE=Debug
+    -DWITH_QT6=ON
+    -DBUILD_APPSTREAM=ON
+    -DBUILD_APPDATA=ON
+
   GIT_HASH: ${{ github.event.head_commit.id }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: docker://kdeneon/plasma:user
+      image: docker://registry.fedoraproject.org/fedora:40
       options: --tmpfs /build:rw --user 0:0
     steps:
       - name: "prepare source"
         uses: calamares/actions/generic-checkout@v5
       - name: "install dependencies"
         shell: bash
-        run: ./ci/deps-neon.sh
+        run: ./ci/deps-fedora-qt6.sh
       - name: "build"
         shell: bash
         run: ./ci/build.sh