Skip to content

Commit 6e7c903

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #40 from libxengine/develop
Merge V3.10.0.1001
2 parents b5a67d4 + 2427b47 commit 6e7c903

File tree

79 files changed

+2436
-479
lines changed

Some content is hidden

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

79 files changed

+2436
-479
lines changed

‎.github/workflows/RockyArm64_build.yml‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
name: rocky Arm64 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: ubuntu-24.04
18+
env:
19+
IMAGE_NAME: rockylinux/rockylinux:9.5
20+
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
arch: [linux/arm64]
25+
26+
steps:
27+
# 检出您的主仓库代码
28+
- name: Checkout main repository code
29+
uses: actions/checkout@v4
30+
with:
31+
ref: 'develop'
32+
33+
- name: Set up QEMU
34+
uses: docker/setup-qemu-action@v3
35+
36+
- name: Build ${{ matrix.arch }}
37+
run: |
38+
docker run --platform ${{ matrix.arch }} --rm \
39+
-v ${{ github.workspace }}:/workspace \
40+
-w /workspace ${{ env.IMAGE_NAME }} /bin/sh -c '
41+
set -e
42+
dnf update -y
43+
dnf install --allowerasing git make g++ wget curl jq unzip -y
44+
45+
git config --global --add safe.directory /workspace
46+
git submodule init
47+
git submodule update
48+
49+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
50+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_Arm64.zip
51+
unzip ./XEngine_RockyLinux_9_Arm64.zip -d ./XEngine_RockyLinux_9_Arm64
52+
cd XEngine_RockyLinux_9_Arm64
53+
54+
chmod 777 ./XEngine_LINEnv.sh
55+
./XEngine_LINEnv.sh -i 0
56+
57+
dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
58+
59+
cp -rf ./XEngine_Include /usr/local/include
60+
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;
61+
ldconfig
62+
cd ..
63+
64+
cd XEngine_Source
65+
make ARCH=Arm64 RELEASE=1
66+
make FLAGS=InstallAll
67+
make FLAGS=CleanAll
68+
cd ..
69+
70+
cd XEngine_Release
71+
chmod 777 copydb.sh
72+
./copydb.sh
73+
./XEngine_APIServiceApp -t
74+
chown -R $(id -u):$(id -g) .
75+
chmod -R a+r . '
76+
77+
- name: Upload folder as artifact with RockyLinux
78+
uses: actions/upload-artifact@v4
79+
with:
80+
name: XEngine_APIServiceApp-RockyLinux_9_Arm64
81+
path: XEngine_Release/
82+
retention-days: 1

‎.github/workflows/RockyX86_64_build.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: rocky x86_64 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: ubuntu-latest
18+
container:
19+
image: rockylinux/rockylinux:9.5
20+
21+
steps:
22+
# 检出您的主仓库代码
23+
- name: Checkout main repository code
24+
uses: actions/checkout@v4
25+
with:
26+
ref: 'develop'
27+
28+
# 检出依赖的xengine仓库到指定的xengine目录
29+
- name: Checkout dependency repository (xengine)
30+
uses: actions/checkout@v4
31+
with:
32+
repository: libxengine/libxengine
33+
path: libxengine
34+
35+
- name: sub module checkout (XEngine_OPenSource)
36+
uses: actions/checkout@v4
37+
with:
38+
repository: libxengine/XEngine_OPenSource
39+
path: XEngine_Source/XEngine_Depend
40+
- name: sub module checkout (XEngine_PhoneData)
41+
uses: actions/checkout@v4
42+
with:
43+
repository: libxengine/XEngine_PhoneData
44+
path: XEngine_Source/XEngine_DBDepend/XEngine_PhoneData
45+
- name: sub module checkout (XEngine_IPMacData)
46+
uses: actions/checkout@v4
47+
with:
48+
repository: libxengine/XEngine_IPMacData
49+
path: XEngine_Source/XEngine_DBDepend/XEngine_IPMacData
50+
51+
- name: install system package
52+
run: |
53+
dnf update -y
54+
ls -al ./XEngine_Source/XEngine_DBDepend/
55+
ls -al ./XEngine_Source/XEngine_DBDepend/XEngine_IPMacData/XEngine_Source
56+
dnf install gcc g++ make git jq unzip -y
57+
# 设置依赖库的环境变量
58+
- name: Set up Dependency rocky linux Environment
59+
run: |
60+
cd libxengine
61+
chmod 777 *
62+
./XEngine_LINEnv.sh -i 0
63+
dnf install lua-devel opencv-devel qrencode-devel leptonica-devel tesseract-devel -y
64+
65+
- name: install xengine library
66+
run: |
67+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
68+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_x86-64.zip
69+
unzip ./XEngine_RockyLinux_9_x86-64.zip -d ./XEngine_RockyLinux_9_x86-64
70+
cd XEngine_RockyLinux_9_x86-64
71+
72+
cp -rf ./XEngine_Include /usr/local/include
73+
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;
74+
ldconfig
75+
76+
- name: make
77+
run: |
78+
cd XEngine_Source
79+
make
80+
make FLAGS=InstallAll
81+
make FLAGS=CleanAll
82+
83+
make RELEASE=1
84+
make FLAGS=InstallAll
85+
make FLAGS=CleanAll
86+
87+
- name: test
88+
run: |
89+
cd XEngine_Release
90+
chmod 777 copydb.sh
91+
./copydb.sh
92+
./XEngine_APIServiceApp -t
93+
94+
- name: Upload folder as artifact with RockyLinux
95+
uses: actions/upload-artifact@v4
96+
with:
97+
name: XEngine_APIServiceApp-RockyLinux_9_x86_64
98+
path: XEngine_Release/
99+
retention-days: 1

‎.github/workflows/UbuntuArm64_build.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: ubuntu Arm64 build workflows
2+
3+
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
paths:
8+
- 'XEngine_Source/**'
9+
- 'XEngine_Release/**'
10+
- '.github/**'
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-24.04
15+
env:
16+
IMAGE_NAME: ubuntu:24.04
17+
18+
strategy:
19+
fail-fast: false
20+
matrix:
21+
arch: [linux/arm64]
22+
23+
steps:
24+
- name: Checkout main repository code
25+
uses: actions/checkout@v4
26+
with:
27+
ref: 'develop'
28+
29+
- name: Set up QEMU
30+
uses: docker/setup-qemu-action@v3
31+
32+
- name: Build ${{ matrix.arch }}
33+
run: |
34+
docker run --platform ${{ matrix.arch }} --rm \
35+
-v ${{ github.workspace }}:/workspace \
36+
-w /workspace ${{ env.IMAGE_NAME }} /bin/sh -c '
37+
set -e
38+
apt update -y
39+
apt install git make g++ wget curl jq unzip -y
40+
apt install liblua5.4-dev libopencv-dev libopencv-contrib-dev libqrencode-dev libleptonica-dev libtesseract-dev -y
41+
42+
git config --global --add safe.directory /workspace
43+
git submodule init
44+
git submodule update
45+
46+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
47+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_Arm64.zip
48+
unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
49+
cd XEngine_UBuntu_24.04_Arm64
50+
51+
chmod 777 ./XEngine_LINEnv.sh
52+
./XEngine_LINEnv.sh -i 0
53+
54+
cp -rf ./XEngine_Include /usr/local/include
55+
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
56+
ldconfig
57+
cd ..
58+
59+
cd XEngine_Source
60+
make ARCH=Arm64 RELEASE=1
61+
make FLAGS=InstallAll
62+
make FLAGS=CleanAll
63+
cd ..
64+
65+
cd XEngine_Release
66+
chmod 777 copydb.sh
67+
./copydb.sh
68+
./XEngine_APIServiceApp -t
69+
chown -R $(id -u):$(id -g) .
70+
chmod -R a+r . '
71+
72+
- name: Upload folder as artifact with ubuntu Arm64
73+
uses: actions/upload-artifact@v4
74+
with:
75+
name: XEngine_APIServiceApp-Ubuntu_24.04_Arm64
76+
path: XEngine_Release/
77+
retention-days: 1

.github/workflows/ubuntubuild.yml renamed to .github/workflows/Ubuntux86_64_build.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ubuntu build workflows
1+
name: ubuntu x86_64 build workflows
22

33
on:
44
push:
@@ -83,20 +83,22 @@ jobs:
8383
- name: test
8484
run: |
8585
cd XEngine_Release
86+
chmod 777 copydb.sh
87+
./copydb.sh
8688
./XEngine_APIServiceApp -t
8789
8890
- name: Upload folder as artifact with ubuntu22.04
8991
if: matrix.os == 'ubuntu-22.04'
9092
uses: actions/upload-artifact@v4
9193
with:
92-
name: XEngine_APIServiceApp-x86_64-Ubuntu-22.04
94+
name: XEngine_APIServiceApp-Ubuntu_22.04_x86_64
9395
path: XEngine_Release/
9496
retention-days: 1
9597

9698
- name: Upload folder as artifact with ubuntu24.04
9799
if: matrix.os == 'ubuntu-24.04'
98100
uses: actions/upload-artifact@v4
99101
with:
100-
name: XEngine_APIServiceApp-x86_64-Ubuntu-24.04
102+
name: XEngine_APIServiceApp-Ubuntu_24.04_x86_64
101103
path: XEngine_Release/
102104
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,21 @@ jobs:
7979
- name: test
8080
run: |
8181
cd XEngine_Release
82+
chmod 777 copydb.sh
83+
./copydb.sh
8284
./XEngine_APIServiceApp -t
8385
8486
- name: Upload folder as artifact with mac x64
8587
if: matrix.os == 'macos-13'
8688
uses: actions/upload-artifact@v4
8789
with:
88-
name: XEngine_APIServiceApp-x86_64-Mac
90+
name: XEngine_APIServiceApp-Mac_x86_64
8991
path: XEngine_Release/
9092
retention-days: 1
9193
- name: Upload folder as artifact with mac arm
9294
if: matrix.os == 'macos-14'
9395
uses: actions/upload-artifact@v4
9496
with:
95-
name: XEngine_APIServiceApp-Arm64-Mac
97+
name: XEngine_APIServiceApp-Mac_Arm64
9698
path: XEngine_Release/
9799
retention-days: 1

0 commit comments

Comments
 (0)