From a24d88a9c1ee97e6fdd8ebcdfe8cbf34e4e759fe Mon Sep 17 00:00:00 2001
From: redtide <redtid3@gmail.com>
Date: Thu, 29 Feb 2024 14:41:35 +0100
Subject: [PATCH] CI: LXQt2 test

---
 .ci/build.sh               |  9 -----
 .ci/install.sh             | 71 ++++++++++++++++++++++++++++++++++++++
 .github/workflows/test.yml | 18 +++++-----
 3 files changed, 81 insertions(+), 17 deletions(-)
 delete mode 100755 .ci/build.sh
 create mode 100755 .ci/install.sh

diff --git a/.ci/build.sh b/.ci/build.sh
deleted file mode 100755
index 9c2e643b0..000000000
--- a/.ci/build.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-set -ex
-
-source shared-ci/prepare-archlinux.sh
-
-# See *depends in https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=lxqt-panel-git
-pacman -S --noconfirm --needed git cmake qt5-tools lxqt-build-tools-git alsa-lib libpulse lm_sensors libstatgrab libsysstat-git solid5 menu-cache libxcomposite lxqt-menu-data-git libdbusmenu-qt5 lxqt-globalkeys-git libxtst
-
-cmake -B build -S .
-make -C build
diff --git a/.ci/install.sh b/.ci/install.sh
new file mode 100755
index 000000000..87ffc39e4
--- /dev/null
+++ b/.ci/install.sh
@@ -0,0 +1,71 @@
+set -ex
+
+#source shared-ci/prepare-archlinux.sh
+
+cat >> /etc/pacman.conf <<EOF
+[lxqt2wip]
+SigLevel = Optional TrustAll
+Server = https://archlive-aur.sourceforge.io/lxqt2wip/x86_64
+EOF
+
+# Needed to allow updating archlinux-keyring package (see below).
+# This also enables usage of third-party keys [1].
+pacman-key --init
+
+# Update the keyring first to allow installing packages signed by newer keys [2].
+# This may be needed when `pacman -Syu` below or other pacman commands in individual LXQt
+# components uses packages signed by newer keys.
+pacman -Sy --noconfirm archlinux-keyring
+
+pacman -Syu --noconfirm
+
+# [1] https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/18
+# [2] https://github.com/lxqt/lxqt-panel/pull/1781#issuecomment-1111755255
+
+# See *depends in https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=lxqt-panel-git
+packages=(
+    alsa-lib
+    cmake
+    git
+    libpulse
+    libstatgrab
+    libxcomposite
+    libxtst
+    lm_sensors
+    menu-cache
+    qt6-base
+    qt6-tools
+#   kwindowsystem
+#   solid
+)
+pacman -S --noconfirm --needed ${packages[@]}
+
+# Enable testing repo only to checkout KF6Solid, KF6WindowSystem and layer-shell-qt
+cat >> /etc/pacman.conf <<EOF
+[core-testing]
+Include = /etc/pacman.d/mirrorlist
+[extra-testing]
+Include = /etc/pacman.d/mirrorlist
+EOF
+pacman -Sy --noconfirm
+
+lxqt2wip_packages=(
+    layer-shell-qt
+    kwindowsystem
+    solid
+    libdbusmenu-lxqt-git
+    lxqt2-build-tools-git
+    lxqt-menu-data-git
+    libqt6xdg-git
+    liblxqt-git
+    lxqt-globalkeys-git
+    libsysstat-git
+)
+pacman -S --noconfirm ${lxqt2wip_packages[@]}
+
+# workaround
+cd /usr/share/cmake
+cp -R lxqt2-menu-data lxqt-menu-data
+cd lxqt-menu-data
+mv lxqt2-menu-data-config.cmake lxqt-menu-data-config.cmake
+mv lxqt2-menu-data-config-version.cmake lxqt-menu-data-config-version.cmake
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f35bf11b3..0f2449078 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,12 +7,14 @@ jobs:
     runs-on: ubuntu-20.04
     container: archlinux:base-devel
     steps:
-    - name: Checkout the repo
-      uses: actions/checkout@v2
-    - name: Checkout shared CI repo
-      uses: actions/checkout@v2
-      with:
-        repository: lxqt/ci
-        path: shared-ci
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: bash ./.ci/install.sh
+
+    - name: Configure
+      run: cmake -B build -S .
+
     - name: Build
-      run: bash ./.ci/build.sh
+      run: cmake --build build