Use normal commands on cmake build

Author: naokiri

.github/actions/archlinux_build_environment_setup/README.md

@@ -1,7 +1,8 @@
 # archlinux_build_environment_setup
 
 Installs one example environment's build dependencies for fcitx5-cskk. 
-Which means it installs wayland, qt6, fcitx5, cskk, and all dependencies of them.
+Which means it installs wayland, qt6, fcitx5, cskk, and all dependencies of them under /opt/fcitx. 
+Cmake files will be at /opt/fcitx/lib/cmake/Fcitx5Core/Fcitx5CoreConfig.cmake
 
 Depends on archlinux. Caller should use 
 

.github/workflows/build_pass.yml

@@ -22,13 +22,11 @@ jobs:
           echo cskk_version=`bin/cskk_version.sh` >> ${GITHUB_OUTPUT}
       - name: Install required build environment
         uses: ./.github/actions/archlinux_build_environment_setup
-      - name: Build
-        uses: ashutoshvarma/action-cmake-build@master
-        with:
-          build-dir: ${{ runner.workspace }}/build
-          cc: gcc
-          cxx: g++
-          build-type: Release
-          run-test: false
-          configure-options: -DFCITX_INSTALL_USE_FCITX_SYS_PATHS=ON -DUSE_QT6=Off
-          build-options: --verbose
+      - name: Build fcitx5-cskk
+        run: |
+          cmake -B build \
+            -DCMAKE_PREFIX_PATH=/opt/fcitx \
+            -DENABLE_QT=On \
+            -DUSE_QT6=On \
+            -DFCITX_INSTALL_USE_FCITX_SYS_PATHS=ON
+          cmake --build build --parallel

.github/workflows/release.yml

@@ -31,27 +31,62 @@ jobs:
       run: test "refs/tags/v${{ steps.version.outputs.version }}" = ${{ github.ref }}
     - name: Install required build environment
       uses: ./.github/actions/archlinux_build_environment_setup
-    - name: Build (and install) fcitx5-cskk
-      uses: fcitx/github-actions@cmake
-      with:
-        path: fcitx5-cskk
-        cmake-option: >-
-          -DENABLE_QT=On -DUSE_QT6=On -DFCITX_INSTALL_USE_FCITX_SYS_PATHS=ON
+    - name: Install dpkg for package verification
+      run: pacman -S --noconfirm dpkg
+    - name: Build fcitx5-cskk
+      run: |
+        cmake -B build \
+          -DCMAKE_PREFIX_PATH=/opt/fcitx \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCPACK_PACKAGING_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu \
+          -DENABLE_QT=On \
+          -DUSE_QT6=On
+        cmake --build build --parallel
     - name: Pack deb
       run: |
-        cd ${{ runner.workspace }}/build
-        cpack -G DEB -DFCITX_INSTALL_USE_FCITX_SYS_PATHS=On
+        cd build
+        cpack -G DEB \
+          -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=amd64
+        cp _CPack_Packages/Linux/DEB/fcitx5-cskk_*.deb .
+#    - name: Debug - List build directory
+#      run: |
+#        echo "=== Contents of build/ directory ==="
+#        ls -la build/
+#        echo "=== Searching for .deb files ==="
+#        find build/ -name "*.deb" -ls
+    - name: Verify deb package contents
+      run: |
+        echo "=== Checking .deb package structure ==="
+        dpkg -c build/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb
+        echo ""
+        echo "=== Verifying main plugin location ==="
+        if dpkg -c build/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb | grep -q "./usr/lib/x86_64-linux-gnu/fcitx5/fcitx5-cskk.so"; then
+          echo "✓ Main plugin in correct location: /usr/lib/x86_64-linux-gnu/fcitx5/fcitx5-cskk.so"
+        else
+          echo "✗ ERROR: Main plugin not found at /usr/lib/x86_64-linux-gnu/fcitx5/fcitx5-cskk.so"
+          exit 1
+        fi
+    - name: Rename deb for workflow_dispatch builds
+      id: timestamp
+      if: github.event_name == 'workflow_dispatch'
+      run: |
+        TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+        mv build/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb \
+           build/fcitx5-cskk_${{ steps.version.outputs.version }}_${TIMESTAMP}_amd64.deb
+        echo "Renamed to: fcitx5-cskk_${{ steps.version.outputs.version }}_${TIMESTAMP}_amd64.deb"
+        echo "timestamp=${TIMESTAMP}" >> ${GITHUB_OUTPUT}
     - name: Attatch artifact to Release
       if: github.event_name == 'release'
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          ${{ runner.workspace }}/fcitx5-cskk/_packages/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb
+          build/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb
     - name: Upload DEB artifact
       if: github.event_name == 'workflow_dispatch'
       uses: actions/upload-artifact@v4
       with:
-        name: fcitx5-cskk-deb
-        path: ${{ runner.workspace }}/fcitx5-cskk/_packages/fcitx5-cskk_${{ steps.version.outputs.version }}_amd64.deb
+        name: fcitx5-cskk-deb-${{ steps.timestamp.outputs.timestamp }}
+        path: build/fcitx5-cskk_*_amd64.deb
         if-no-files-found: error
         retention-days: 30

README.md

@@ -13,7 +13,7 @@ Same as other fcitx5 plugin project.
 
 For example in Debian,
 
-    $ sudo apt install gettext cmake extra-cmake-modules fcitx5-modules-dev qtbase5-dev qtdeclarative5-dev libfcitx5-qt-dev
+    $ sudo apt install gettext cmake extra-cmake-modules fcitx5-modules-dev qtbase6-dev qt6-wayland qtdeclarative6-dev libfcitx6-qt-dev
 
 For full features.