Skip to content

Commit e54c063

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #110 from libxengine/develop
V3.22 Release
2 parents 5b4db51 + 1b7673a commit e54c063

66 files changed

Lines changed: 819 additions & 615 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/Alma_build.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,18 @@ jobs:
4444

4545
steps:
4646
- name: Checkout main repository code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
48+
with:
49+
ref: 'develop'
4850

4951
- name: Checkout dependency repository (xengine)
50-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5153
with:
5254
repository: libxengine/libxengine
5355
path: libxengine
5456

5557
- name: sub module checkout (opensource)
56-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
5759
with:
5860
repository: libxengine/XEngine_OPenSource
5961
path: XEngine_Source/XEngine_DependLibrary
@@ -89,7 +91,7 @@ jobs:
8991
./XEngine_AuthorizeService -t
9092
9193
- name: Upload folder as artifact
92-
uses: actions/upload-artifact@v4
94+
uses: actions/upload-artifact@v6
9395
with:
9496
name: XEngine_AuthorizeService-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
9597
path: XEngine_Release/

‎.github/workflows/Centos_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ jobs:
4848

4949
steps:
5050
- name: Checkout main repository code
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v6
5252

5353
- name: Checkout dependency repository (xengine)
54-
uses: actions/checkout@v4
54+
uses: actions/checkout@v6
5555
with:
5656
repository: libxengine/libxengine
5757
path: libxengine
5858

5959
- name: sub module checkout (opensource)
60-
uses: actions/checkout@v4
60+
uses: actions/checkout@v6
6161
with:
6262
repository: libxengine/XEngine_OPenSource
6363
path: XEngine_Source/XEngine_DependLibrary
@@ -93,7 +93,7 @@ jobs:
9393
./XEngine_AuthorizeService -t
9494
9595
- name: Upload folder as artifact
96-
uses: actions/upload-artifact@v4
96+
uses: actions/upload-artifact@v6
9797
with:
9898
name: XEngine_AuthorizeService-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
9999
path: XEngine_Release/

‎.github/workflows/Rocky_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ jobs:
4444

4545
steps:
4646
- name: Checkout main repository code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848
with:
4949
ref: 'develop'
5050

5151
- name: Checkout dependency repository (xengine)
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
with:
5454
repository: libxengine/libxengine
5555
path: libxengine
5656

5757
- name: sub module checkout (opensource)
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v6
5959
with:
6060
repository: libxengine/XEngine_OPenSource
6161
path: XEngine_Source/XEngine_DependLibrary
@@ -95,7 +95,7 @@ jobs:
9595
./XEngine_AuthorizeService -t
9696
9797
- name: Upload folder as artifact with RockyLinux
98-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v6
9999
with:
100100
name: XEngine_AuthorizeService-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
101101
path: XEngine_Release/

‎.github/workflows/Ubuntu_build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424

2525
steps:
2626
- name: Checkout main repository code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828
with:
2929
ref: 'develop'
3030

3131
- name: Checkout dependency repository (xengine)
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v6
3333
with:
3434
repository: libxengine/libxengine
3535
path: libxengine
@@ -102,28 +102,28 @@ jobs:
102102
103103
- name: Upload folder as artifact with ubuntu22.04
104104
if: matrix.os == 'ubuntu-22.04'
105-
uses: actions/upload-artifact@v4
105+
uses: actions/upload-artifact@v6
106106
with:
107107
name: XEngine_AuthorizeService-Ubuntu_22.04_x86-64
108108
path: XEngine_Release/
109109
retention-days: 1
110110
- name: Upload folder as artifact with ubuntu24.04
111111
if: matrix.os == 'ubuntu-24.04'
112-
uses: actions/upload-artifact@v4
112+
uses: actions/upload-artifact@v6
113113
with:
114114
name: XEngine_AuthorizeService-Ubuntu_24.04_x86-64
115115
path: XEngine_Release/
116116
retention-days: 1
117117
- name: Upload folder as artifact with ubuntu24.04 arm64
118118
if: matrix.os == 'ubuntu-24.04-arm'
119-
uses: actions/upload-artifact@v4
119+
uses: actions/upload-artifact@v6
120120
with:
121121
name: XEngine_AuthorizeService-Ubuntu_24.04_Arm64
122122
path: XEngine_Release/
123123
retention-days: 1
124124
- name: Upload folder as artifact with ubuntu22.04 arm64
125125
if: matrix.os == 'ubuntu-22.04-arm'
126-
uses: actions/upload-artifact@v4
126+
uses: actions/upload-artifact@v6
127127
with:
128128
name: XEngine_AuthorizeService-Ubuntu_22.04_Arm64
129129
path: XEngine_Release/

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jobs:
2525
- language: c-cpp
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929
with:
3030
ref: 'develop'
3131

3232
- name: Checkout dependency repository (xengine)
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v6
3434
with:
3535
repository: libxengine/libxengine
3636
path: libxengine
@@ -50,7 +50,7 @@ jobs:
5050
sudo ./XEngine_LINEnv.sh -i 3
5151
5252
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@v3
53+
uses: github/codeql-action/init@v4
5454
with:
5555
languages: ${{ matrix.language }}
5656

@@ -60,6 +60,6 @@ jobs:
6060
make
6161
6262
- name: Perform CodeQL Analysis
63-
uses: github/codeql-action/analyze@v3
63+
uses: github/codeql-action/analyze@v4
6464
with:
6565
category: "/language:${{ matrix.language }}"

‎.github/workflows/cppcheck.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout main repository code
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919
with:
2020
ref: 'develop'
2121

@@ -29,7 +29,7 @@ jobs:
2929
continue-on-error: true
3030

3131
- name: Upload Cppcheck Results
32-
uses: actions/upload-artifact@v4
32+
uses: actions/upload-artifact@v6
3333
with:
3434
name: cppcheck_results
3535
path: static_analysis/log.xml

‎.github/workflows/debian_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ jobs:
3636

3737
steps:
3838
- name: Checkout main repository code
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v6
4040

4141
- name: Checkout dependency repository (xengine)
42-
uses: actions/checkout@v4
42+
uses: actions/checkout@v6
4343
with:
4444
repository: libxengine/libxengine
4545
path: libxengine
4646

4747
- name: sub module checkout (opensource)
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949
with:
5050
repository: libxengine/XEngine_OPenSource
5151
path: XEngine_Source/XEngine_DependLibrary
@@ -81,7 +81,7 @@ jobs:
8181
./XEngine_AuthorizeService -t
8282
8383
- name: Upload folder as artifact
84-
uses: actions/upload-artifact@v4
84+
uses: actions/upload-artifact@v6
8585
with:
8686
name: XEngine_AuthorizeService-Debian_${{ matrix.version }}_x86-64
8787
path: XEngine_Release/

‎.github/workflows/fedora_build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ jobs:
3434

3535
steps:
3636
- name: Checkout main repository code
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v6
3838

3939
- name: Checkout dependency repository (xengine)
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v6
4141
with:
4242
repository: libxengine/libxengine
4343
path: libxengine
4444

4545
- name: sub module checkout (opensource)
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747
with:
4848
repository: libxengine/XEngine_OPenSource
4949
path: XEngine_Source/XEngine_DependLibrary
@@ -82,7 +82,7 @@ jobs:
8282
./XEngine_AuthorizeService -t
8383
8484
- name: Upload folder as artifact
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8686
with:
8787
name: XEngine_AuthorizeService-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
8888
path: XEngine_Release/

‎.github/workflows/macbuild.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020

2121
steps:
2222
- name: Checkout main repository code
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v6
2424
with:
2525
ref: 'develop'
2626

2727
# 检出依赖的xengine仓库到指定的xengine目录
2828
- name: Checkout dependency repository (xengine)
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
3030
with:
3131
repository: libxengine/libxengine
3232
path: libxengine
@@ -85,14 +85,14 @@ jobs:
8585
8686
- name: Upload folder as artifact with mac x64
8787
if: matrix.os == 'macos-15-intel'
88-
uses: actions/upload-artifact@v4
88+
uses: actions/upload-artifact@v6
8989
with:
9090
name: XEngine_AuthorizeService-Mac_x86-64
9191
path: XEngine_Release/
9292
retention-days: 1
9393
- name: Upload folder as artifact with mac arm
9494
if: matrix.os == 'macos-15'
95-
uses: actions/upload-artifact@v4
95+
uses: actions/upload-artifact@v6
9696
with:
9797
name: XEngine_AuthorizeService-Mac_Arm64
9898
path: XEngine_Release/

‎.github/workflows/msbuild.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121
steps:
2222
# 检出您的主仓库代码
2323
- name: Checkout main repository code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525
with:
2626
ref: 'develop'
2727

2828
# 检出依赖的xengine仓库到指定的xengine目录
2929
- name: Checkout dependency repository (xengine)
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v6
3131
with:
3232
repository: libxengine/libxengine
3333
path: libxengine
@@ -110,21 +110,21 @@ jobs:
110110

111111
- name: Upload folder as artifact with x86
112112
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
113-
uses: actions/upload-artifact@v4
113+
uses: actions/upload-artifact@v6
114114
with:
115115
name: XEngine_AuthorizeService-Windows_x86-32
116116
path: XEngine_Release/
117117
retention-days: 1
118118
- name: Upload folder as artifact with x64
119119
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
120-
uses: actions/upload-artifact@v4
120+
uses: actions/upload-artifact@v6
121121
with:
122122
name: XEngine_AuthorizeService-Windows_x86-64
123123
path: XEngine_Release/
124124
retention-days: 1
125125
- name: Upload folder as artifact with Arm64
126126
if: matrix.configuration == 'Release' && matrix.platform == 'Arm64'
127-
uses: actions/upload-artifact@v4
127+
uses: actions/upload-artifact@v6
128128
with:
129129
name: XEngine_AuthorizeService-Windows_Arm64
130130
path: XEngine_Release/

0 commit comments

Comments
 (0)