From 1b9d8b1f9189a416582818aeb0b926e3a4e2d9e2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 10 Sep 2023 20:23:06 +0200
Subject: [PATCH] CI: tweak opensuse-qt6 nightly build

Split the install-dependencies off into a shell script instead of
being part of the workflow, so that it can be run manually or
by other means than the GH workflow.
---
 .github/workflows/nightly-opensuse-qt6.sh  | 17 ++++++++++
 .github/workflows/nightly-opensuse-qt6.yml | 36 +++-------------------
 2 files changed, 21 insertions(+), 32 deletions(-)
 create mode 100755 .github/workflows/nightly-opensuse-qt6.sh

diff --git a/.github/workflows/nightly-opensuse-qt6.sh b/.github/workflows/nightly-opensuse-qt6.sh
new file mode 100755
index 000000000..24ec9233d
--- /dev/null
+++ b/.github/workflows/nightly-opensuse-qt6.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+# 
+# Install dependencies for the nightly-opensuse-qt6 build
+#
+# Add a Qt6/KF6 repo
+zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo
+zypper --non-interactive refresh
+zypper --non-interactive up
+zypper --non-interactive in git-core jq curl
+# From deploycala.py
+zypper --non-interactive in bison flex git make cmake gcc-c++
+zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel
+zypper --non-interactive in libicu-devel libatasmart-devel
+# Qt6/KF6 dependencies
+zypper --non-interactive in qt6-concurrent-devel qt6-gui-devel qt6-linguist-devel qt6-network-devel qt6-svg-devel qt6-declarative-devel
+zypper --non-interactive in kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel
+zypper --non-interactive in libpolkit-qt6-1-devel
diff --git a/.github/workflows/nightly-opensuse-qt6.yml b/.github/workflows/nightly-opensuse-qt6.yml
index c109fbf6c..8a16743c0 100644
--- a/.github/workflows/nightly-opensuse-qt6.yml
+++ b/.github/workflows/nightly-opensuse-qt6.yml
@@ -20,40 +20,12 @@ jobs:
       image: docker://opensuse/tumbleweed
       options: --tmpfs /build:rw --user 0:0
     steps:
-      - name: "prepare env"
-        shell: bash
-        run: |
-          # Add a Qt6/KF6 repo
-          zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo
-          zypper --non-interactive refresh
-          zypper --non-interactive up
-          zypper --non-interactive in git-core jq curl
-          # From deploycala.py
-          zypper --non-interactive in bison flex git make cmake gcc-c++
-          zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel
-          zypper --non-interactive in libicu-devel libatasmart-devel
-          # Qt6/KF6 dependencies
-          zypper --non-interactive in qt6-concurrent-devel qt6-gui-devel qt6-linguist-devel qt6-network-devel qt6-svg-devel qt6-declarative-devel
-          zypper --non-interactive in kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel
-          zypper --non-interactive in libpolkit-qt6-1-devel
       - name: "prepare source"
         uses: calamares/actions/generic-checkout@v4
+      - name: "install dependencies"
+        shell: bash
+        run: |
+          ./github/workflows/nightly-opensuse-qt6.sh
       - name: "build"
         id: build
         uses: calamares/actions/generic-build@v4
-      - name: "notify: ok"
-        if: ${{ success() && github.repository == 'calamares/calamares' }}
-        uses: calamares/actions/matrix-notify@v4
-        with:
-          token: ${{ secrets.MATRIX_TOKEN }}
-          room: ${{ secrets.MATRIX_ROOM }}
-          message: |
-            OK ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}
-      - name: "notify: fail"
-        if: ${{ failure() && github.repository == 'calamares/calamares' }}
-        uses: calamares/actions/matrix-notify@v4
-        with:
-          token: ${{ secrets.MATRIX_TOKEN }}
-          room: ${{ secrets.MATRIX_ROOM }}
-          message: |
-            FAIL ${{ github.workflow }} in ${{ github.repository }} ${{ steps.build.outputs.git-summary }}