Skip to content

Commit e74de4e

Browse files
committed
ci:add fedora system support
ci:improved build
1 parent 6f739a1 commit e74de4e

File tree

7 files changed

+127
-40
lines changed

7 files changed

+127
-40
lines changed

.github/workflows/Rocky_build.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,20 @@ jobs:
5151
- name: install system package
5252
run: |
5353
dnf update -y
54-
dnf install gcc g++ make git jq unzip -y
55-
- name: Set up Dependency rocky linux Environment
56-
run: |
57-
cd libxengine
58-
chmod 777 *
59-
./XEngine_LINEnv.sh -i 0
54+
dnf install gcc g++ make git jq unzip wget -y
55+
56+
- name: Set TERM variable
57+
run: echo "TERM=xterm" >> $GITHUB_ENV
58+
6059
- name: install xengine library
6160
run: |
6261
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
6362
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_9_${{ matrix.artifact }}.zip
6463
unzip ./XEngine_RockyLinux_9_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_9_${{ matrix.artifact }}
6564
cd XEngine_RockyLinux_9_${{ matrix.artifact }}
6665
67-
cp -rf ./XEngine_Include /usr/local/include
68-
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/lib64 \;
69-
ldconfig
66+
chmod 777 *
67+
./XEngine_LINEnv.sh -i 3
7068
7169
- name: make
7270
run: |

.github/workflows/Ubuntu_build.yml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ jobs:
3939
git submodule init
4040
git submodule update
4141
42+
- name: Set TERM variable
43+
run: echo "TERM=xterm" >> $GITHUB_ENV
44+
4245
- name: Set up Dependency ubuntu24.04 Environment
4346
if: matrix.os == 'ubuntu-24.04'
4447
run: |
@@ -48,48 +51,33 @@ jobs:
4851
- name: Set up Dependency ubuntu24.04 ARM64 Environment
4952
if: matrix.os == 'ubuntu-24.04-arm'
5053
run: |
51-
cd libxengine
52-
chmod 777 *
53-
sudo ./XEngine_LINEnv.sh -i 0
54-
5554
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
5655
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_Arm64.zip
5756
unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
5857
cd XEngine_UBuntu_24.04_Arm64
5958
60-
sudo cp -rf ./XEngine_Include /usr/local/include
61-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
62-
sudo ldconfig
59+
chmod 777 *
60+
sudo ./XEngine_LINEnv.sh -i 3
6361
- name: Set up Dependency ubuntu22.04 Environment
6462
if: matrix.os == 'ubuntu-22.04'
6563
run: |
66-
cd libxengine
67-
chmod 777 *
68-
sudo ./XEngine_LINEnv.sh -i 0
69-
7064
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
7165
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_x86-64.zip
7266
unzip ./XEngine_UBuntu_22.04_x86-64.zip -d ./XEngine_UBuntu_22.04_x86-64
7367
cd XEngine_UBuntu_22.04_x86-64
7468
75-
sudo cp -rf ./XEngine_Include /usr/local/include
76-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
77-
sudo ldconfig
69+
chmod 777 *
70+
sudo ./XEngine_LINEnv.sh -i 3
7871
- name: Set up Dependency ubuntu22.04 arm64 Environment
7972
if: matrix.os == 'ubuntu-22.04-arm'
8073
run: |
81-
cd libxengine
82-
chmod 777 *
83-
sudo ./XEngine_LINEnv.sh -i 0
84-
8574
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
8675
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_22.04_Arm64.zip
8776
unzip ./XEngine_UBuntu_22.04_Arm64.zip -d ./XEngine_UBuntu_22.04_Arm64
8877
cd XEngine_UBuntu_22.04_Arm64
8978
90-
sudo cp -rf ./XEngine_Include /usr/local/include
91-
sudo find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
92-
sudo ldconfig
79+
chmod 777 *
80+
sudo ./XEngine_LINEnv.sh -i 3
9381
9482
- name: make x86
9583
if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-22.04'

.github/workflows/codeql.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
git submodule init
4141
git submodule update
4242
43+
- name: Set TERM variable
44+
run: echo "TERM=xterm" >> $GITHUB_ENV
45+
4346
- name: Set up Dependency Environment
4447
run: |
4548
cd libxengine

.github/workflows/debian_build.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,20 @@ jobs:
4545
- name: install system package
4646
run: |
4747
apt update -y
48-
apt install gcc g++ make git jq unzip curl -y
48+
apt install gcc g++ make git jq unzip curl wget -y
4949
50-
- name: Set up Dependency rocky linux Environment
51-
run: |
52-
cd libxengine
53-
chmod 777 *
54-
./XEngine_LINEnv.sh -i 0
50+
- name: Set TERM variable
51+
run: echo "TERM=xterm" >> $GITHUB_ENV
52+
5553
- name: install xengine library
5654
run: |
5755
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
5856
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
5957
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
6058
cd XEngine_Debian_12_${{ matrix.artifact }}
6159
62-
cp -rf ./XEngine_Include /usr/local/include
63-
find ./XEngine_Linux -name "*.so" -exec cp {} /usr/local/lib \;
64-
ldconfig
60+
chmod 777 *
61+
./XEngine_LINEnv.sh -i 3
6562
6663
- name: make
6764
run: |

.github/workflows/fedora_build.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: fedora 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: fedora:${{ matrix.fedora-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+
fedora-version: 42
28+
artifact: x86-64
29+
- arch: amd64
30+
runner: ubuntu-24.04
31+
platform: linux/amd64
32+
fedora-version: 41
33+
artifact: x86-64
34+
35+
steps:
36+
- name: Checkout main repository code
37+
uses: actions/checkout@v4
38+
39+
- name: Checkout dependency repository (xengine)
40+
uses: actions/checkout@v4
41+
with:
42+
repository: libxengine/libxengine
43+
path: libxengine
44+
45+
- name: sub module checkout (opensource)
46+
uses: actions/checkout@v4
47+
with:
48+
repository: libxengine/XEngine_OPenSource
49+
path: XEngine_Source/XEngine_Depend
50+
51+
- name: install system package
52+
run: |
53+
dnf update -y
54+
dnf install gcc g++ make git jq unzip wget -y
55+
56+
- name: Set TERM variable
57+
run: echo "TERM=xterm" >> $GITHUB_ENV
58+
59+
- name: install xengine library
60+
run: |
61+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
62+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip
63+
unzip ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}.zip -d ./XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
64+
cd XEngine_Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
65+
66+
chmod 777 *
67+
./XEngine_LINEnv.sh -i 3
68+
- name: make
69+
run: |
70+
cd XEngine_Source
71+
make
72+
make FLAGS=InstallAll
73+
make FLAGS=CleanAll
74+
75+
make RELEASE=1
76+
make FLAGS=InstallAll
77+
make FLAGS=CleanAll
78+
cd ..
79+
- name: test
80+
run: |
81+
cd XEngine_Release
82+
./XEngine_ProxyServiceApp -t
83+
84+
- name: Upload folder as artifact
85+
uses: actions/upload-artifact@v4
86+
with:
87+
name: XEngine_ProxyServiceApp-Fedora_${{ matrix.fedora-version }}_${{ matrix.artifact }}
88+
path: XEngine_Release/
89+
retention-days: 1

.github/workflows/macbuild.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ jobs:
3838
3939
- name: brew install
4040
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
41-
41+
42+
- name: Set TERM variable
43+
run: echo "TERM=xterm" >> $GITHUB_ENV
44+
4245
- name: Set up Dependency x86_64 Environment
4346
if: matrix.os == 'macos-13'
4447
run: |

.github/workflows/release.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ jobs:
3434
skip_unpack: true
3535
if_no_artifact_found: fail
3636
path: ./XRelease/
37+
- name: Download fedora build
38+
uses: dawidd6/action-download-artifact@v6
39+
with:
40+
workflow: fedora_build.yml
41+
workflow_conclusion: success
42+
check_artifacts: false
43+
skip_unpack: true
44+
if_no_artifact_found: fail
45+
path: ./XRelease/
3746
- name: Download RockyLinux build
3847
uses: dawidd6/action-download-artifact@v6
3948
with:

0 commit comments

Comments
 (0)