Skip to content

Commit 7b13df4

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #69 from libxengine/develop
V3.22 Merge to release
2 parents bf7b3a4 + 3c81513 commit 7b13df4

56 files changed

Lines changed: 434 additions & 469 deletions

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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ jobs:
4444

4545
steps:
4646
- name: Checkout main repository code
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v6
4848

4949
- name: Checkout dependency repository (xengine)
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@v6
5151
with:
5252
repository: libxengine/libxengine
5353
path: libxengine
5454

5555
- name: sub module checkout (opensource)
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v6
5757
with:
5858
repository: libxengine/XEngine_OPenSource
5959
path: XEngine_Source/XEngine_DependLibrary
@@ -92,7 +92,7 @@ jobs:
9292
./XEngine_XStorageApp -t
9393
9494
- name: Upload folder as artifact with Alma Linux
95-
uses: actions/upload-artifact@v4
95+
uses: actions/upload-artifact@v7
9696
with:
9797
name: XEngine_XStorageApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
9898
path: XEngine_Release/

‎.github/workflows/Centos_build.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: centos build workflows
33
on:
44
push:
55
branches:
6-
- 'develop'
6+
- 'develop1'
77
paths:
88
- 'XEngine_Source/**'
99
- 'XEngine_Release/**'
@@ -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
@@ -79,7 +79,6 @@ jobs:
7979
8080
chmod 777 *
8181
./XEngine_LINEnv.sh -i 3
82-
8382
- name: make
8483
run: |
8584
cd XEngine_Source
@@ -96,7 +95,7 @@ jobs:
9695
./XEngine_XStorageApp -t
9796
9897
- name: Upload folder as artifact with CentOS
99-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v7
10099
with:
101100
name: XEngine_XStorageApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
102101
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
@@ -94,7 +94,7 @@ jobs:
9494
./XEngine_XStorageApp -t
9595
9696
- name: Upload folder as artifact with RockyLinux
97-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v7
9898
with:
9999
name: XEngine_XStorageApp-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
100100
path: XEngine_Release/

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 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

‎.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@v7
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,18 +36,18 @@ jobs:
3636

3737
steps:
3838
- name: Checkout main repository code
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v6
4040
with:
4141
ref: 'develop'
4242

4343
- name: Checkout dependency repository (xengine)
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v6
4545
with:
4646
repository: libxengine/libxengine
4747
path: libxengine
4848

4949
- name: sub module checkout (opensource)
50-
uses: actions/checkout@v4
50+
uses: actions/checkout@v6
5151
with:
5252
repository: libxengine/XEngine_OPenSource
5353
path: XEngine_Source/XEngine_DependLibrary
@@ -86,7 +86,7 @@ jobs:
8686
./XEngine_XStorageApp -t
8787
8888
- name: Upload folder as artifact
89-
uses: actions/upload-artifact@v4
89+
uses: actions/upload-artifact@v7
9090
with:
9191
name: XEngine_XStorageApp-Debian_${{ matrix.version }}_x86-64
9292
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_XStorageApp -t
8383
8484
- name: Upload folder as artifact
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v7
8686
with:
8787
name: XEngine_XStorageApp-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
8888
path: XEngine_Release/

‎.github/workflows/macbuild.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,21 @@ jobs:
1717
strategy:
1818
matrix:
1919
include:
20-
- os: macos-13
21-
- os: macos-14
20+
- os: macos-15
21+
- os: macos-15-intel
22+
- os: macos-26
23+
- os: macos-26-intel
2224
runs-on: ${{ matrix.os }}
2325

2426
steps:
2527
- name: Checkout main repository code
26-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2729
with:
2830
ref: 'develop'
2931

3032
# 检出依赖的xengine仓库到指定的xengine目录
3133
- name: Checkout dependency repository (xengine)
32-
uses: actions/checkout@v4
34+
uses: actions/checkout@v6
3335
with:
3436
repository: libxengine/libxengine
3537
path: libxengine
@@ -46,13 +48,13 @@ jobs:
4648
run: echo "TERM=xterm" >> $GITHUB_ENV
4749

4850
- name: Set up Dependency x86_64 Environment
49-
if: matrix.os == 'macos-13'
51+
if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-26-intel'
5052
run: |
5153
cd libxengine
5254
chmod 777 *
5355
./XEngine_LINEnv.sh -i 3
5456
- name: Set up Dependency Arm64 Environment
55-
if: matrix.os == 'macos-14'
57+
if: matrix.os == 'macos-15' || matrix.os == 'macos-26'
5658
run: |
5759
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)
5860
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -80,15 +82,15 @@ jobs:
8082
./XEngine_XStorageApp -t
8183
8284
- name: Upload folder as artifact with mac x64
83-
if: matrix.os == 'macos-13'
84-
uses: actions/upload-artifact@v4
85+
if: matrix.os == 'macos-15-intel'
86+
uses: actions/upload-artifact@v7
8587
with:
8688
name: XEngine_XStorageApp-Mac_x86_64
8789
path: XEngine_Release/
8890
retention-days: 1
8991
- name: Upload folder as artifact with mac arm
90-
if: matrix.os == 'macos-14'
91-
uses: actions/upload-artifact@v4
92+
if: matrix.os == 'macos-15'
93+
uses: actions/upload-artifact@v7
9294
with:
9395
name: XEngine_XStorageApp-Mac_Arm64
9496
path: XEngine_Release/

‎.github/workflows/msbuild.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
@@ -76,7 +76,7 @@ jobs:
7676
shell: pwsh
7777

7878
- name: Setup MSBuild
79-
uses: microsoft/setup-msbuild@v2
79+
uses: microsoft/setup-msbuild@v3
8080

8181
- name: Build Solution
8282
run: msbuild XEngine_Source/XEngine_StorageApp.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
@@ -113,21 +113,21 @@ jobs:
113113

114114
- name: Upload folder as artifact with x86
115115
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
116-
uses: actions/upload-artifact@v4
116+
uses: actions/upload-artifact@v7
117117
with:
118118
name: XEngine_StorageApp-Windows_x86_32
119119
path: XEngine_Release/
120120
retention-days: 1
121121
- name: Upload folder as artifact with x64
122122
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
123-
uses: actions/upload-artifact@v4
123+
uses: actions/upload-artifact@v7
124124
with:
125125
name: XEngine_StorageApp-Windows_x86_64
126126
path: XEngine_Release/
127127
retention-days: 1
128128
- name: Upload folder as artifact with ARM64
129129
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'
130-
uses: actions/upload-artifact@v4
130+
uses: actions/upload-artifact@v7
131131
with:
132132
name: XEngine_StorageApp-Windows_Arm64
133133
path: XEngine_Release/

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
steps:
1313
# 检出代码并包含标签
1414
- name: Checkout code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616
with:
1717
fetch-depth: 0
1818

1919
- name: Download ubuntu build
20-
uses: dawidd6/action-download-artifact@v6
20+
uses: dawidd6/action-download-artifact@v20
2121
with:
2222
workflow: ubuntu_build.yml
2323
workflow_conclusion: success
@@ -26,7 +26,7 @@ jobs:
2626
if_no_artifact_found: fail
2727
path: ./XRelease/
2828
- name: Download debian build
29-
uses: dawidd6/action-download-artifact@v6
29+
uses: dawidd6/action-download-artifact@v20
3030
with:
3131
workflow: debian_build.yml
3232
workflow_conclusion: success
@@ -35,7 +35,7 @@ jobs:
3535
if_no_artifact_found: fail
3636
path: ./XRelease/
3737
- name: Download fedora build
38-
uses: dawidd6/action-download-artifact@v6
38+
uses: dawidd6/action-download-artifact@v20
3939
with:
4040
workflow: fedora_build.yml
4141
workflow_conclusion: success
@@ -44,25 +44,16 @@ jobs:
4444
if_no_artifact_found: fail
4545
path: ./XRelease/
4646
- name: Download Rocky build
47-
uses: dawidd6/action-download-artifact@v6
47+
uses: dawidd6/action-download-artifact@v20
4848
with:
4949
workflow: Rocky_build.yml
5050
workflow_conclusion: success
5151
check_artifacts: false
5252
skip_unpack: true
5353
if_no_artifact_found: fail
5454
path: ./XRelease/
55-
- name: Download CentOS build
56-
uses: dawidd6/action-download-artifact@v6
57-
with:
58-
workflow: Centos_build.yml
59-
workflow_conclusion: success
60-
check_artifacts: false
61-
skip_unpack: true
62-
if_no_artifact_found: fail
63-
path: ./XRelease/
6455
- name: Download Alma build
65-
uses: dawidd6/action-download-artifact@v6
56+
uses: dawidd6/action-download-artifact@v20
6657
with:
6758
workflow: Alma_build.yml
6859
workflow_conclusion: success
@@ -71,7 +62,7 @@ jobs:
7162
if_no_artifact_found: fail
7263
path: ./XRelease/
7364
- name: Download macbuild
74-
uses: dawidd6/action-download-artifact@v6
65+
uses: dawidd6/action-download-artifact@v20
7566
with:
7667
workflow: macbuild.yml
7768
workflow_conclusion: success
@@ -80,7 +71,7 @@ jobs:
8071
if_no_artifact_found: fail
8172
path: ./XRelease/
8273
- name: Download msbuild
83-
uses: dawidd6/action-download-artifact@v6
74+
uses: dawidd6/action-download-artifact@v20
8475
with:
8576
workflow: msbuild.yml
8677
workflow_conclusion: success

0 commit comments

Comments
 (0)