ci:fix script

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Oct 27, 2023 · f5ace3b · f5ace3b
1 parent 1c43f62
commit f5ace3b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 23 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -28,16 +28,16 @@ jobs:
           sudo apt install -y make gcc
 
       - name: Install Qt android
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt android
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
           target: 'android'
@@ -53,7 +53,7 @@ jobs:
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.5.3
         run: |
           export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r25b
           export ANDROID_BUILD_DIR=$(pwd)/android-build

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -22,24 +22,24 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt ios
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
           target: ios
 
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.5.3
         run: |
           cd quard_star_tools
           git describe --always --long --abbrev=10 --exclude '*' | awk '{print "\""$0"\""}' > git_tag.inc

diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -213,9 +213,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
@@ -225,6 +225,16 @@ jobs:
           sudo apt update
           sudo apt install -y make gcc upx-ucl
 
+      - name: build depend
+        run: |
+          cd quard_star_tools/depend
+          sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules tree
+          export PATH=$Qt6_DIR/bin:$PATH
+          export PATH=$Qt6_DIR/../../Qt/Tools/CMake/bin:$PATH
+          export Qt6GuiTools_DIR=$Qt6_DIR
+          ./build_fcitx_qt6.sh
+          cp ./fcitx-qt5-1.2.7/build/qt6/platforminputcontext/libfcitxplatforminputcontextplugin-qt6.so ./
+          
       - name: Build all
         shell: bash -l {0}
         run: |
@@ -263,10 +273,10 @@ jobs:
           git checkout
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           arch: win64_mingw
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
@@ -279,8 +289,6 @@ jobs:
           qmake -makefile
           mingw32-make
           windeployqt.exe ./release/out/quard_star_tools.exe
-          Copy-Item C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/lib*.dll ./release/out/
-          Copy-Item C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/lib*.dll ./release/out/
           Rename-Item ./release/out quard_star_tools_w64
           Rename-Item ./release gui_tools
 
@@ -299,9 +307,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
@@ -28,17 +28,17 @@ jobs:
           sudo apt install -y make gcc
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '6.5.2'
+          version: '6.6.0'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt webassembly
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           arch: wasm_singlethread
-          version: '6.5.2'
+          version: '6.6.0'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
@@ -51,7 +51,7 @@ jobs:
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.6.0
         run: |
           cd quard_star_tools
           git describe --always --long --abbrev=10 --exclude '*' | awk '{print "\""$0"\""}' > git_tag.inc

diff --git a/quard_star_tools/README.md b/quard_star_tools/README.md
@@ -15,5 +15,7 @@ Quard Star Tools是Quard Star Tutorial项目的一个子项目。其基于Qt编
 - jffs2 fork自https://github.com/rickardp/jffs2extract
 - treemodel.cpp fork自https://github.com/chocoball/QTreeViewTest
 - QDarkStyleSheet fork自https://github.com/ColinDuquesnoy/QDarkStyleSheet
+- utf8proc fork自https://github.com/JuliaStrings/utf8proc
+- fcitx-qt5 fork自https://github.com/fcitx/fcitx-qt5
 
 本项目中最初查看分析文件系统映像文件的需求编写了qfsviewer.cpp等相关代码，后考虑该功能的通用性需求，将其拆分为单独的项目发布，详见https://github.com/QQxiaoming/QFSViewer.git，未来将该项目作为本项目的上游依赖同步更新。
diff --git a/quard_star_tools/depend/.gitignore b/quard_star_tools/depend/.gitignore
@@ -0,0 +1 @@
+!build_fcitx_qt6.sh
diff --git a/quard_star_tools/depend/build_fcitx_qt6.sh b/quard_star_tools/depend/build_fcitx_qt6.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+# ubuntu20.04 need install 
+# sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules
+# export PATH="~Qt/6.2.0/gcc_64/bin":$PATH
+# export PATH="~/Qt/Tools/CMake/bin":$PATH
+# export Qt6GuiTools_DIR=/home/qqm/Qt/6.2.0/gcc_64
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+tar -xzvf fcitx-qt5-1.2.7.tar.gz
+cd $SHELL_FOLDER/fcitx-qt5-1.2.7
+mkdir build
+cd build
+cmake .. -DENABLE_QT5=OFF -DENABLE_QT6=ON
+make -j4
diff --git a/quard_star_tools/depend/fcitx-qt5-1.2.7.tar.gz b/quard_star_tools/depend/fcitx-qt5-1.2.7.tar.gz
diff --git a/quard_star_tools/tools/ci_build_deb/build.sh b/quard_star_tools/tools/ci_build_deb/build.sh
@@ -3,5 +3,6 @@
 ./linuxdeploy-x86_64.AppImage --executable=../../release/out/quard_star_tools_temp --appdir=../../release/out --plugin=qt
 rm -rf ../../release/out/apprun-hooks
 cp ../../release/out/quard_star_tools ../../release/out/usr/bin/
+cp ../../depend/libfcitxplatforminputcontextplugin-qt6.so ../../release/out/usr/plugins/platforminputcontexts/
 rm ../../release/out/usr/bin/quard_star_tools_temp
 mv ../../release/out/usr ../../release/output