V3.18 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:
@@ -42,18 +52,17 @@ jobs:
         run: |
             dnf update -y
             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
       - 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 \;         
@@ -78,6 +87,6 @@ jobs:
       - name: Upload folder as artifact with RockyLinux
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_AuthorizeService-RockyLinux-9-x86_64
+          name: XEngine_AuthorizeService-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:
@@ -18,6 +18,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:
@@ -43,6 +45,21 @@ jobs:
             cd libxengine
             chmod 777 *
             sudo ./XEngine_LINEnv.sh -i 3
+      - name: Set up Dependency ubuntu24.04 ARM64 Environment
+        if: matrix.os == 'ubuntu-24.04-arm'
+        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_24.04_Arm64.zip
+            unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
+            cd XEngine_UBuntu_24.04_Arm64
+
+            sudo cp -rf ./XEngine_Include /usr/local/include
+            sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;         
+            sudo ldconfig
       - name: Set up Dependency ubuntu22.04 Environment
         if: matrix.os == 'ubuntu-22.04'
         run: |
@@ -55,18 +72,38 @@ jobs:
             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
+      - name: Set up Dependency ubuntu22.04 arm64 Environment
+        if: matrix.os == 'ubuntu-22.04-arm'
+        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_Arm64.zip
+            unzip ./XEngine_UBuntu_22.04_Arm64.zip -d ./XEngine_UBuntu_22.04_Arm64
+            cd XEngine_UBuntu_22.04_Arm64
+
             sudo cp -rf ./XEngine_Include /usr/local/include
             sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;         
             sudo ldconfig
 
-      - name: make
+      - name: make x86
+        if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-22.04'
         run: | 
             cd XEngine_Source
-            make
+            make RELEASE=1
             make FLAGS=InstallAll
             make FLAGS=CleanAll
-
-            make RELEASE=1
+            cd ..
+      - name: make arm
+        if: matrix.os == 'ubuntu-24.04-arm' || matrix.os == 'ubuntu-22.04-arm'
+        run: | 
+            cd XEngine_Source
+            make ARCH=Arm64 RELEASE=1
             make FLAGS=InstallAll
             make FLAGS=CleanAll
             cd ..
@@ -79,13 +116,27 @@ jobs:
         if: matrix.os == 'ubuntu-22.04'
         uses: actions/upload-artifact@v4
         with:
-          name: XEngine_AuthorizeService-x86_64-Ubuntu-22.04
+          name: XEngine_AuthorizeService-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_AuthorizeService-Ubuntu-24.04-x86_64
+          name: XEngine_AuthorizeService-Ubuntu_24.04_x86-64
+          path: XEngine_Release/
+          retention-days: 1
+      - name: Upload folder as artifact with ubuntu24.04 arm64
+        if: matrix.os == 'ubuntu-24.04-arm'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_AuthorizeService-Ubuntu_24.04_Arm64
+          path: XEngine_Release/
+          retention-days: 1
+      - name: Upload folder as artifact with ubuntu22.04 arm64
+        if: matrix.os == 'ubuntu-22.04-arm'
+        uses: actions/upload-artifact@v4
+        with:
+          name: XEngine_AuthorizeService-Ubuntu_22.04_Arm64
           path: XEngine_Release/
           retention-days: 1