From 675d17fe59576ffd3ec7b49f29aad6185c5e92a3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 28 Sep 2023 22:04:07 +0200
Subject: [PATCH] CI: migrate opensuse CI to ci/ scripts

---
 .github/workflows/nightly-opensuse-qt6.yml |  3 +-
 .github/workflows/nightly-opensuse.yml     | 63 ++--------------------
 ci/deps-opensuse.sh                        | 42 +++++++++++++++
 3 files changed, 47 insertions(+), 61 deletions(-)
 create mode 100755 ci/deps-opensuse.sh

diff --git a/.github/workflows/nightly-opensuse-qt6.yml b/.github/workflows/nightly-opensuse-qt6.yml
index cc6751fe8..9ba2ad895 100644
--- a/.github/workflows/nightly-opensuse-qt6.yml
+++ b/.github/workflows/nightly-opensuse-qt6.yml
@@ -27,8 +27,7 @@ jobs:
         uses: calamares/actions/generic-checkout@v5
       - name: "install dependencies"
         shell: bash
-        run: |
-          ./ci/deps-opensuse-qt6.sh
+        run: ./ci/deps-opensuse-qt6.sh
       - name: "build"
         id: build
         uses: calamares/actions/generic-build@v4
diff --git a/.github/workflows/nightly-opensuse.yml b/.github/workflows/nightly-opensuse.yml
index 5b268883c..538425c14 100644
--- a/.github/workflows/nightly-opensuse.yml
+++ b/.github/workflows/nightly-opensuse.yml
@@ -21,67 +21,12 @@ jobs:
     steps:
       - name: "prepare env"
         shell: bash
-        run: |
-          zypper --non-interactive up
-          zypper --non-interactive in git-core jq curl
-          # From deploycala.py
-          zypper --non-interactive in \
-            "autoconf" \
-            "automake" \
-            "bison" \
-            "flex" \
-            "git" \
-            "libtool" \
-            "m4" \
-            "make" \
-            "cmake" \
-            "extra-cmake-modules" \
-            "gcc-c++"
-          zypper --non-interactive in \
-            "libqt5-qtbase-devel" \
-            "libqt5-linguist-devel" \
-            "libqt5-qtsvg-devel" \
-            "libqt5-qtdeclarative-devel" \
-            "libqt5-qtwebengine-devel" \
-            "yaml-cpp-devel" \
-            "libpolkit-qt5-1-devel" \
-            "libpwquality-devel" \
-            "parted-devel" \
-            "python-devel" \
-            "libboost_headers-devel" \
-            "libboost_python3-devel"
-          zypper --non-interactive in \
-            "kdbusaddons-devel" \
-            "kservice-devel" \
-            "kpackage-devel" \
-            "kparts-devel" \
-            "kcrash-devel" \
-            "kpmcore-devel" \
-            "plasma5-workspace-devel" \
-            "plasma-framework-devel" \
-          # Additional dependencies
-          zypper --non-interactive in \
-            libicu-devel \
-            libAppStreamQt-devel \
-            libatasmart-devel
+        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.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 }}
diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh
new file mode 100755
index 000000000..01ff84fe3
--- /dev/null
+++ b/ci/deps-opensuse.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# Install dependencies for the nightly-opensuse build
+#
+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 \
+    "libqt5-qtbase-devel" \
+    "libqt5-linguist-devel" \
+    "libqt5-qtsvg-devel" \
+    "libqt5-qtdeclarative-devel" \
+    "libqt5-qtwebengine-devel" \
+    "yaml-cpp-devel" \
+    "libpolkit-qt5-1-devel" \
+    "libpwquality-devel" \
+    "parted-devel" \
+    "python-devel" \
+    "libboost_headers-devel" \
+    "libboost_python3-devel"
+zypper --non-interactive in \
+    "extra-cmake-modules" \
+    "kdbusaddons-devel" \
+    "kservice-devel" \
+    "kpackage-devel" \
+    "kparts-devel" \
+    "kcrash-devel" \
+    "kpmcore-devel" \
+    "plasma5-workspace-devel" \
+    "plasma-framework-devel"
+# Additional dependencies
+zypper --non-interactive in \
+    libicu-devel \
+    libAppStreamQt-devel \
+    libatasmart-devel