Skip to content

Commit bf7b3a4

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #65 from libxengine/develop
V3.21 Merge
2 parents a7e8f85 + fced725 commit bf7b3a4

Some content is hidden

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

60 files changed

+1030
-737
lines changed

‎.github/workflows/Alma_build.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: AlmaLinux build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: almalinux:${{ matrix.version }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
- arch: arm64
30+
runner: ubuntu-24.04-arm
31+
platform: linux/arm64
32+
artifact: Arm64
33+
version: 9
34+
- arch: amd64
35+
runner: ubuntu-24.04
36+
platform: linux/amd64
37+
artifact: x86-64
38+
version: 10
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
version: 10
44+
45+
steps:
46+
- name: Checkout main repository code
47+
uses: actions/checkout@v4
48+
49+
- name: Checkout dependency repository (xengine)
50+
uses: actions/checkout@v4
51+
with:
52+
repository: libxengine/libxengine
53+
path: libxengine
54+
55+
- name: sub module checkout (opensource)
56+
uses: actions/checkout@v4
57+
with:
58+
repository: libxengine/XEngine_OPenSource
59+
path: XEngine_Source/XEngine_DependLibrary
60+
61+
- name: Set TERM variable
62+
run: echo "TERM=xterm" >> $GITHUB_ENV
63+
64+
- name: install system package
65+
run: |
66+
dnf update -y
67+
dnf install gcc g++ make git jq unzip wget -y
68+
69+
- name: install xengine library
70+
run: |
71+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
72+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
73+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
74+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
75+
76+
chmod 777 *
77+
./XEngine_LINEnv.sh -i 3
78+
- name: make
79+
run: |
80+
cd XEngine_Source
81+
make
82+
make FLAGS=InstallAll
83+
make FLAGS=CleanAll
84+
85+
make RELEASE=1
86+
make FLAGS=InstallAll
87+
make FLAGS=CleanAll
88+
cd ..
89+
- name: test
90+
run: |
91+
cd XEngine_Release
92+
./XEngine_XStorageApp -t
93+
94+
- name: Upload folder as artifact with Alma Linux
95+
uses: actions/upload-artifact@v4
96+
with:
97+
name: XEngine_XStorageApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
98+
path: XEngine_Release/
99+
retention-days: 1

‎.github/workflows/Centos_build.yml‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
name: centos build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
permissions:
13+
contents: read
14+
15+
jobs:
16+
build:
17+
runs-on: ${{ matrix.runner }}
18+
container:
19+
image: quay.io/centos/centos:${{ matrix.stream }}
20+
options: --platform ${{ matrix.platform }}
21+
strategy:
22+
matrix:
23+
include:
24+
- arch: amd64
25+
runner: ubuntu-24.04
26+
platform: linux/amd64
27+
artifact: x86-64
28+
version: 9
29+
stream: stream9
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
version: 10
35+
stream: stream10
36+
- arch: arm64
37+
runner: ubuntu-24.04-arm
38+
platform: linux/arm64
39+
artifact: Arm64
40+
version: 9
41+
stream: stream9
42+
- arch: arm64
43+
runner: ubuntu-24.04-arm
44+
platform: linux/arm64
45+
artifact: Arm64
46+
version: 10
47+
stream: stream10
48+
49+
steps:
50+
- name: Checkout main repository code
51+
uses: actions/checkout@v4
52+
53+
- name: Checkout dependency repository (xengine)
54+
uses: actions/checkout@v4
55+
with:
56+
repository: libxengine/libxengine
57+
path: libxengine
58+
59+
- name: sub module checkout (opensource)
60+
uses: actions/checkout@v4
61+
with:
62+
repository: libxengine/XEngine_OPenSource
63+
path: XEngine_Source/XEngine_DependLibrary
64+
65+
- name: Set TERM variable
66+
run: echo "TERM=xterm" >> $GITHUB_ENV
67+
68+
- name: install system package
69+
run: |
70+
dnf update -y
71+
dnf install gcc g++ make git jq unzip wget -y
72+
73+
- name: install xengine library
74+
run: |
75+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
76+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
77+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
78+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
79+
80+
chmod 777 *
81+
./XEngine_LINEnv.sh -i 3
82+
83+
- name: make
84+
run: |
85+
cd XEngine_Source
86+
make
87+
make FLAGS=InstallAll
88+
make FLAGS=CleanAll
89+
90+
make RELEASE=1
91+
make FLAGS=InstallAll
92+
make FLAGS=CleanAll
93+
- name: test
94+
run: |
95+
cd XEngine_Release
96+
./XEngine_XStorageApp -t
97+
98+
- name: Upload folder as artifact with CentOS
99+
uses: actions/upload-artifact@v4
100+
with:
101+
name: XEngine_XStorageApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
102+
path: XEngine_Release/
103+
retention-days: 1

‎.github/workflows/Rocky_build.yml‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: rockylinux/rockylinux:9.5
19+
image: rockylinux/rockylinux:${{ matrix.version }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
@@ -25,10 +25,22 @@ jobs:
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
2727
artifact: x86-64
28+
version: 9
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
artifact: x86-64
33+
version: 10
2834
- arch: arm64
2935
runner: ubuntu-24.04-arm
3036
platform: linux/arm64
3137
artifact: Arm64
38+
version: 9
39+
- arch: arm64
40+
runner: ubuntu-24.04-arm
41+
platform: linux/arm64
42+
artifact: Arm64
43+
version: 10
3244

3345
steps:
3446
- name: Checkout main repository code
@@ -46,7 +58,7 @@ jobs:
4658
uses: actions/checkout@v4
4759
with:
4860
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
61+
path: XEngine_Source/XEngine_DependLibrary
5062

5163
- name: Set TERM variable
5264
run: echo "TERM=xterm" >> $GITHUB_ENV
@@ -55,12 +67,13 @@ jobs:
5567
run: |
5668
dnf update -y
5769
dnf install gcc g++ make git jq unzip wget -y
70+
5871
- name: install xengine library
5972
run: |
6073
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
61-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_${{ matrix.artifact }}.zip
62-
unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
63-
cd XEngine_RockyLinux_9_${{ matrix.artifact }}
74+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
75+
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
76+
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
6477
6578
chmod 777 *
6679
./XEngine_LINEnv.sh -i 3
@@ -83,6 +96,6 @@ jobs:
8396
- name: Upload folder as artifact with RockyLinux
8497
uses: actions/upload-artifact@v4
8598
with:
86-
name: XEngine_XStorageApp-RockyLinux_9_${{ matrix.artifact }}
99+
name: XEngine_XStorageApp-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
87100
path: XEngine_Release/
88101
retention-days: 1

‎.github/workflows/debian_build.yml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ${{ matrix.runner }}
1818
container:
19-
image: debian:bookworm
19+
image: debian:${{ matrix.name }}
2020
options: --platform ${{ matrix.platform }}
2121
strategy:
2222
matrix:
@@ -25,6 +25,14 @@ jobs:
2525
runner: ubuntu-24.04
2626
platform: linux/amd64
2727
artifact: x86-64
28+
name: bookworm
29+
version: 12
30+
- arch: amd64
31+
runner: ubuntu-24.04
32+
platform: linux/amd64
33+
artifact: x86-64
34+
name: trixie
35+
version: 13
2836

2937
steps:
3038
- name: Checkout main repository code
@@ -42,7 +50,7 @@ jobs:
4250
uses: actions/checkout@v4
4351
with:
4452
repository: libxengine/XEngine_OPenSource
45-
path: XEngine_Source/XEngine_Depend
53+
path: XEngine_Source/XEngine_DependLibrary
4654

4755
- name: Set TERM variable
4856
run: echo "TERM=xterm" >> $GITHUB_ENV
@@ -55,9 +63,9 @@ jobs:
5563
- name: install xengine library
5664
run: |
5765
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
58-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
59-
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
60-
cd XEngine_Debian_12_${{ matrix.artifact }}
66+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
67+
unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
68+
cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
6169
6270
chmod 777 *
6371
./XEngine_LINEnv.sh -i 3
@@ -80,6 +88,6 @@ jobs:
8088
- name: Upload folder as artifact
8189
uses: actions/upload-artifact@v4
8290
with:
83-
name: XEngine_XStorageApp-Debian_12_x86-64
91+
name: XEngine_XStorageApp-Debian_${{ matrix.version }}_x86-64
8492
path: XEngine_Release/
8593
retention-days: 1

‎.github/workflows/fedora_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v4
4747
with:
4848
repository: libxengine/XEngine_OPenSource
49-
path: XEngine_Source/XEngine_Depend
49+
path: XEngine_Source/XEngine_DependLibrary
5050

5151
- name: install system package
5252
run: |

‎.github/workflows/msbuild.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ jobs:
9999
cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
100100
cd XEngine_Release
101101
./VSCopy_x64.bat
102+
./XEngine_StorageApp.exe -t
102103
shell: pwsh
103104
- name: Conditional Step for ARM64 Release
104105
if: matrix.configuration == 'Release' && matrix.platform == 'ARM64'

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,24 @@ jobs:
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/
64+
- name: Download Alma build
65+
uses: dawidd6/action-download-artifact@v6
66+
with:
67+
workflow: Alma_build.yml
68+
workflow_conclusion: success
69+
check_artifacts: false
70+
skip_unpack: true
71+
if_no_artifact_found: fail
72+
path: ./XRelease/
5573
- name: Download macbuild
5674
uses: dawidd6/action-download-artifact@v6
5775
with:

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "XEngine_Source/XEngine_Depend"]
2-
path = XEngine_Source/XEngine_Depend
2+
path = XEngine_Source/XEngine_DependLibrary
33
url = https://github.com/libxengine/XEngine_OPenSource.git

0 commit comments

Comments
 (0)