V3.22 Merge to release

.github/workflows/Alma_build.yml

@@ -44,16 +44,16 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
 
       - name: sub module checkout (opensource)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/XEngine_OPenSource
           path: XEngine_Source/XEngine_DependLibrary
@@ -92,7 +92,7 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact with Alma Linux
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
           path: XEngine_Release/

.github/workflows/Centos_build.yml

@@ -3,7 +3,7 @@ name: centos build workflows
 on:
   push:
     branches:
-      - 'develop'
+      - 'develop1'
     paths:
       - 'XEngine_Source/**'
       - 'XEngine_Release/**'
@@ -48,16 +48,16 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
 
       - name: sub module checkout (opensource)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/XEngine_OPenSource
           path: XEngine_Source/XEngine_DependLibrary
@@ -79,7 +79,6 @@ jobs:
 
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
-
       - name: make
         run: |
             cd XEngine_Source
@@ -96,7 +95,7 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact with CentOS
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
           path: XEngine_Release/

.github/workflows/Rocky_build.yml

@@ -44,18 +44,18 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'develop'
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
 
       - name: sub module checkout (opensource)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/XEngine_OPenSource
           path: XEngine_Source/XEngine_DependLibrary
@@ -94,7 +94,7 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact with RockyLinux
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
           path: XEngine_Release/

.github/workflows/codeql.yml

@@ -25,12 +25,12 @@ jobs:
         - language: c-cpp
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
           ref: 'develop'
 
     - name: Checkout dependency repository (xengine)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         repository: libxengine/libxengine
         path: libxengine

.github/workflows/cppcheck.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
     - name: Checkout main repository code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
         ref: 'develop'
 
@@ -29,7 +29,7 @@ jobs:
       continue-on-error: true
 
     - name: Upload Cppcheck Results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: cppcheck_results
         path: static_analysis/log.xml

.github/workflows/debian_build.yml

@@ -36,18 +36,18 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'develop'
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
 
       - name: sub module checkout (opensource)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/XEngine_OPenSource
           path: XEngine_Source/XEngine_DependLibrary
@@ -86,7 +86,7 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-Debian_${{ matrix.version }}_x86-64
           path: XEngine_Release/

.github/workflows/fedora_build.yml

@@ -34,16 +34,16 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
 
       - name: sub module checkout (opensource)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/XEngine_OPenSource
           path: XEngine_Source/XEngine_DependLibrary
@@ -82,7 +82,7 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
           path: XEngine_Release/

.github/workflows/macbuild.yml

@@ -17,19 +17,21 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-13
-          - os: macos-14
+          - os: macos-15
+          - os: macos-15-intel
+          - os: macos-26
+          - os: macos-26-intel
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'develop'
 
        # 检出依赖的xengine仓库到指定的xengine目录
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
@@ -46,13 +48,13 @@ jobs:
         run: echo "TERM=xterm" >> $GITHUB_ENV
 
       - name: Set up Dependency x86_64 Environment 
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26-intel'
         run: |
             cd libxengine
             chmod 777 *
             ./XEngine_LINEnv.sh -i 3
       - name: Set up Dependency Arm64 Environment 
-        if: matrix.os == 'macos-14'
+        if: matrix.os == 'macos-15' || matrix.os == 'macos-26'
         run: |
             latest_tag=$(git ls-remote --tags --sort="v:refname" https://github.com/libxengine/libxengine.git | awk '{print $2}' | sed 's/refs\/tags\///' | tail -n 1)
             wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -80,15 +82,15 @@ jobs:
             ./XEngine_XStorageApp -t
 
       - name: Upload folder as artifact with mac x64
-        if: matrix.os == 'macos-13'
-        uses: actions/upload-artifact@v4
+        if: matrix.os == 'macos-15-intel'
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-Mac_x86_64
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with mac arm
-        if: matrix.os == 'macos-14'
-        uses: actions/upload-artifact@v4
+        if: matrix.os == 'macos-15'
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_XStorageApp-Mac_Arm64
           path: XEngine_Release/

.github/workflows/msbuild.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: Checkout main repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'develop'
 
       - name: Checkout dependency repository (xengine)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: libxengine/libxengine
           path: libxengine
@@ -76,7 +76,7 @@ jobs:
         shell: pwsh
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
 
       - name: Build Solution
         run: msbuild XEngine_Source/XEngine_StorageApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
@@ -113,21 +113,21 @@ jobs:
 
       - name: Upload folder as artifact with x86
         if: matrix.configuration == 'Release' && matrix.platform == 'x86'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_StorageApp-Windows_x86_32
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with x64
         if: matrix.configuration == 'Release' && matrix.platform == 'x64'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_StorageApp-Windows_x86_64
           path: XEngine_Release/
           retention-days: 1
       - name: Upload folder as artifact with ARM64
         if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: XEngine_StorageApp-Windows_Arm64
           path: XEngine_Release/

.github/workflows/release.yml

@@ -12,12 +12,12 @@ jobs:
     steps:
         # 检出代码并包含标签
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 
 
       - name: Download ubuntu build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: ubuntu_build.yml
           workflow_conclusion: success
@@ -26,7 +26,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download debian build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: debian_build.yml
           workflow_conclusion: success
@@ -35,7 +35,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download fedora build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: fedora_build.yml
           workflow_conclusion: success
@@ -44,25 +44,16 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download Rocky build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: Rocky_build.yml
           workflow_conclusion: success
           check_artifacts: false
           skip_unpack: true
           if_no_artifact_found: fail
           path: ./XRelease/
-      - name: Download CentOS build
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          workflow: Centos_build.yml
-          workflow_conclusion: success
-          check_artifacts: false
-          skip_unpack: true
-          if_no_artifact_found: fail
-          path: ./XRelease/
       - name: Download Alma build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: Alma_build.yml
           workflow_conclusion: success
@@ -71,7 +62,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download macbuild
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: macbuild.yml
           workflow_conclusion: success
@@ -80,7 +71,7 @@ jobs:
           if_no_artifact_found: fail
           path: ./XRelease/
       - name: Download msbuild
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v20
         with:
           workflow: msbuild.yml
           workflow_conclusion: success