V3.11.0.1001 Merge

.github/workflows/RockyX86_64_build.yml → .github/workflows/Rocky_build.yml

@@ -1,4 +1,4 @@
-name: rocky x86_64 build workflows
+name: rocky build workflows
 
 on:
   push:
@@ -14,18 +14,28 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner }}
     container:
       image: rockylinux/rockylinux:9.5
+      options: --platform ${{ matrix.platform }}
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runner: ubuntu-24.04
+            platform: linux/amd64
+            artifact: x86-64
+          - arch: arm64
+            runner: ubuntu-24.04-arm
+            platform: linux/arm64
+            artifact: Arm64
 
     steps:
-       # 检出您的主仓库代码
       - name: Checkout main repository code
         uses: actions/checkout@v4
         with:
           ref: 'develop'
 
-       # 检出依赖的xengine仓库到指定的xengine目录
       - name: Checkout dependency repository (xengine)
         uses: actions/checkout@v4
         with:
@@ -48,31 +58,27 @@ jobs:
           repository: libxengine/XEngine_IPMacData
           path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
 
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
       - name: install system package
         run: |
             dnf update -y
-            ls -al ./XEngine_Source/XEngine_DBDepend/
-            ls -al ./XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_Source
-            dnf install gcc g++ make git jq unzip -y
-      # 设置依赖库的环境变量
-      - name: Set up Dependency rocky linux Environment
-        run: |
-            cd libxengine
-            chmod 777 *
-            ./XEngine_LINEnv.sh -i 0
-            dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
-
+            dnf install gcc g++ make git jq unzip wget -y
+
       - name: install xengine library
-        run: |           
+        run: |
             latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
-            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_x86-64.zip
-            unzip ./XEngine_RockyLinux_9_x86-64.zip -d ./XEngine_RockyLinux_9_x86-64
-            cd XEngine_RockyLinux_9_x86-64
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_${{ matrix.artifact }}.zip
+            unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
+            cd XEngine_RockyLinux_9_${{ matrix.artifact }}
 
-            cp -rf ./XEngine_Include /usr/local/include
-            find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;         
-            ldconfig
+            chmod 777 *
+            ./XEngine_LINEnv.sh -i 3
 
+      - name: install build package
+        run: |
+            dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
       - name: make
         run: | 
             cd XEngine_Source
@@ -94,6 +100,6 @@ jobs:
       - name: Upload folder as artifact with RockyLinux
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_APIServiceApp-RockyLinux_9_x86_64
+          name: XEngine_APIServiceApp-RockyLinux_9_${{ matrix.artifact }}
           path: XEngine_Release/
           retention-days: 1

.github/workflows/Ubuntux86_64_build.yml → .github/workflows/Ubuntu_build.yml

@@ -1,4 +1,4 @@
-name: ubuntu x86_64 build workflows
+name: ubuntu build workflows
 
 on:
   push:
@@ -19,6 +19,8 @@ jobs:
         include:
           - os: ubuntu-22.04
           - os: ubuntu-24.04
+          - os: ubuntu-22.04-arm
+          - os: ubuntu-24.04-arm
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -46,7 +48,9 @@ jobs:
           sudo apt upgrade -y
           sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev libleptonica-dev libtesseract-dev -y
 
-      # 设置依赖库的环境变量
+      - name: Set TERM variable
+        run: echo "TERM=xterm" >> $GITHUB_ENV
+
       - name: Set up Dependency ubuntu24.04 Environment
         if: matrix.os == 'ubuntu-24.04'
         run: |
@@ -56,19 +60,34 @@ jobs:
       - name: Set up Dependency ubuntu22.04 Environment
         if: matrix.os == 'ubuntu-22.04'
         run: |
-            cd libxengine
-            chmod 777 *
-            sudo ./XEngine_LINEnv.sh -i 0
-
             latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
             wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_x86-64.zip
             unzip ./XEngine_UBuntu_22.04_x86-64.zip -d ./XEngine_UBuntu_22.04_x86-64
             cd XEngine_UBuntu_22.04_x86-64
 
-            sudo cp -rf ./XEngine_Include /usr/local/include
-            sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;         
-            sudo ldconfig
-      #编译
+            chmod 777 *
+            sudo ./XEngine_LINEnv.sh -i 3
+      - name: Set up Dependency ubuntu22.04 Environment
+        if: matrix.os == 'ubuntu-22.04-arm'
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_Arm64.zip
+            unzip ./XEngine_UBuntu_22.04_Arm64.zip -d ./XEngine_UBuntu_22.04_Arm64
+            cd XEngine_UBuntu_22.04_Arm64
+
+            chmod 777 *
+            sudo ./XEngine_LINEnv.sh -i 3
+      - name: Set up Dependency ubuntu22.04 Environment
+        if: matrix.os == 'ubuntu-24.04-arm'
+        run: |
+            latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
+            wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_Arm64.zip
+            unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
+            cd XEngine_UBuntu_24.04_Arm64
+
+            chmod 777 *
+            sudo ./XEngine_LINEnv.sh -i 3
+
       - name: make
         run: | 
             cd XEngine_Source
@@ -94,11 +113,24 @@ jobs:
           name: XEngine_APIServiceApp-Ubuntu_22.04_x86_64
           path: XEngine_Release/
           retention-days: 1
-
       - name: Upload folder as artifact with ubuntu24.04
         if: matrix.os == 'ubuntu-24.04'
         uses: actions/upload-artifact@v4
         with:
           name: XEngine_APIServiceApp-Ubuntu_24.04_x86_64
           path: XEngine_Release/
+          retention-days: 1
+      - name: Upload folder as artifact with ubuntu22.04-arm
+        if: matrix.os == 'ubuntu-22.04-arm'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_APIServiceApp-Ubuntu_22.04_Arm64
+          path: XEngine_Release/
+          retention-days: 1
+      - name: Upload folder as artifact with ubuntu24.04-arm
+        if: matrix.os == 'ubuntu-24.04-arm'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_APIServiceApp-Ubuntu_24.04_Arm64
+          path: XEngine_Release/
           retention-days: 1

.github/workflows/codeql.yml

@@ -46,6 +46,9 @@ jobs:
           sudo apt upgrade -y
           sudo apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev libleptonica-dev libtesseract-dev -y
 
+    - name: Set TERM variable
+      run: echo "TERM=xterm" >> $GITHUB_ENV
+
     - name: Set up Dependency Environment
       run: |
           cd libxengine