Skip to content

Commit d17a4e8

Browse files
authored
Merge pull request #62 from libxengine/develop
V3.22 Merge
2 parents e6bb8f0 + f1db305 commit d17a4e8

41 files changed

Lines changed: 520 additions & 334 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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ jobs:
4646
- name: Checkout main repository code
4747
uses: actions/checkout@v7
4848

49-
- name: Checkout dependency repository (xengine)
50-
uses: actions/checkout@v7
51-
with:
52-
repository: libxengine/libxengine
53-
path: libxengine
54-
5549
- name: sub module checkout (opensource)
5650
uses: actions/checkout@v7
5751
with:

‎.github/workflows/Rocky_build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ jobs:
4747
uses: actions/checkout@v7
4848
with:
4949
ref: 'develop'
50-
51-
- name: Checkout dependency repository (xengine)
52-
uses: actions/checkout@v7
53-
with:
54-
repository: libxengine/libxengine
55-
path: libxengine
5650

5751
- name: sub module checkout (opensource)
5852
uses: actions/checkout@v7

‎.github/workflows/Ubuntu_build.yml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ jobs:
2020
include:
2121
- os: ubuntu-22.04
2222
- os: ubuntu-24.04
23+
- os: ubuntu-26.04
2324
- os: ubuntu-22.04-arm
2425
- os: ubuntu-24.04-arm
26+
- os: ubuntu-26.04-arm
2527
runs-on: ${{ matrix.os }}
2628

2729
steps:
@@ -37,7 +39,17 @@ jobs:
3739
3840
- name: Set TERM variable
3941
run: echo "TERM=xterm" >> $GITHUB_ENV
40-
42+
43+
- name: Set up Dependency ubuntu26.04 x86-64 Environment
44+
if: matrix.os == 'ubuntu-26.04'
45+
run: |
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_26.04_x86-64.zip
48+
unzip ./XEngine_UBuntu_26.04_x86-64.zip -d ./XEngine_UBuntu_26.04_x86-64
49+
cd XEngine_UBuntu_26.04_x86-64
50+
51+
chmod 777 *
52+
sudo ./XEngine_LINEnv.sh -i 3
4153
- name: Set up Dependency ubuntu24.04 x86-64 Environment
4254
if: matrix.os == 'ubuntu-24.04'
4355
run: |
@@ -76,6 +88,16 @@ jobs:
7688
unzip ./XEngine_UBuntu_24.04_Arm64.zip -d ./XEngine_UBuntu_24.04_Arm64
7789
cd XEngine_UBuntu_24.04_Arm64
7890
91+
chmod 777 *
92+
sudo ./XEngine_LINEnv.sh -i 3
93+
- name: Set up Dependency ubuntu26.04 arm Environment
94+
if: matrix.os == 'ubuntu-26.04-arm'
95+
run: |
96+
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
97+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_26.04_Arm64.zip
98+
unzip ./XEngine_UBuntu_26.04_Arm64.zip -d ./XEngine_UBuntu_26.04_Arm64
99+
cd XEngine_UBuntu_26.04_Arm64
100+
79101
chmod 777 *
80102
sudo ./XEngine_LINEnv.sh -i 3
81103
@@ -109,6 +131,13 @@ jobs:
109131
name: XEngine_MQServiceApp-Ubuntu_24.04_x86_64
110132
path: XEngine_Release/
111133
retention-days: 1
134+
- name: Upload folder as artifact with ubuntu26.04 x86-64
135+
if: matrix.os == 'ubuntu-26.04'
136+
uses: actions/upload-artifact@v7
137+
with:
138+
name: XEngine_MQServiceApp-Ubuntu_26.04_x86_64
139+
path: XEngine_Release/
140+
retention-days: 1
112141
- name: Upload folder as artifact with ubuntu22.04 Arm64
113142
if: matrix.os == 'ubuntu-22.04-arm'
114143
uses: actions/upload-artifact@v7
@@ -122,4 +151,11 @@ jobs:
122151
with:
123152
name: XEngine_MQServiceApp-Ubuntu_24.04_Arm64
124153
path: XEngine_Release/
154+
retention-days: 1
155+
- name: Upload folder as artifact with ubuntu26.04 Arm64
156+
if: matrix.os == 'ubuntu-26.04-arm'
157+
uses: actions/upload-artifact@v7
158+
with:
159+
name: XEngine_MQServiceApp-Ubuntu_26.04_Arm64
160+
path: XEngine_Release/
125161
retention-days: 1

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
analyze:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-26.04
1515
permissions:
1616
security-events: write
1717
packages: read
@@ -40,9 +40,9 @@ jobs:
4040
- name: Set up Dependency Environment
4141
run: |
4242
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
43-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_24.04_x86-64.zip
44-
unzip ./XEngine_UBuntu_24.04_x86-64.zip -d ./XEngine_UBuntu_24.04_x86-64
45-
cd XEngine_UBuntu_24.04_x86-64
43+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_UBuntu_26.04_x86-64.zip
44+
unzip ./XEngine_UBuntu_26.04_x86-64.zip -d ./XEngine_UBuntu_26.04_x86-64
45+
cd XEngine_UBuntu_26.04_x86-64
4646
4747
chmod 777 *
4848
sudo ./XEngine_LINEnv.sh -i 3

‎.github/workflows/debian_build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ jobs:
3838
- name: Checkout main repository code
3939
uses: actions/checkout@v7
4040

41-
- name: Checkout dependency repository (xengine)
42-
uses: actions/checkout@v7
43-
with:
44-
repository: libxengine/libxengine
45-
path: libxengine
46-
4741
- name: sub module checkout (opensource)
4842
uses: actions/checkout@v7
4943
with:

‎.github/workflows/fedora_build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@ jobs:
5656
- name: Checkout main repository code
5757
uses: actions/checkout@v7
5858

59-
- name: Checkout dependency repository (xengine)
60-
uses: actions/checkout@v7
61-
with:
62-
repository: libxengine/libxengine
63-
path: libxengine
64-
6559
- name: sub module checkout (opensource)
6660
uses: actions/checkout@v7
6761
with:
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: freebsd 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: ${{ matrix.runner }}
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
include:
19+
- arch: amd64
20+
runner: ubuntu-24.04
21+
freebsd-arch: x86_64
22+
artifact: x86-64
23+
version: 15.1
24+
- arch: arm64
25+
runner: ubuntu-24.04-arm
26+
freebsd-arch: aarch64
27+
artifact: Arm64
28+
version: 15.1
29+
30+
steps:
31+
- name: Checkout main repository code
32+
uses: actions/checkout@v7
33+
34+
- name: sub module checkout (opensource)
35+
uses: actions/checkout@v7
36+
with:
37+
repository: libxengine/XEngine_OPenSource
38+
path: XEngine_Source/XEngine_DependLibrary
39+
40+
- name: Set TERM variable
41+
run: echo "TERM=xterm" >> $GITHUB_ENV
42+
43+
- name: Build in FreeBSD 15
44+
uses: vmactions/freebsd-vm@v1
45+
with:
46+
release: ${{ matrix.version }}
47+
arch: ${{ matrix.freebsd-arch }}
48+
usesh: true
49+
prepare: |
50+
pkg install -y gcc cmake gmake git pkgconf jq unzip curl wget bash
51+
run: |
52+
latest_tag=$(curl -s -H "Authorization: Bearer ${{ github.token }}" https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
53+
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_FreeBSD_${{ matrix.version }}_${{ matrix.artifact }}.zip
54+
unzip ./XEngine_FreeBSD_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_FreeBSD_${{ matrix.version }}_${{ matrix.artifact }}
55+
cd XEngine_FreeBSD_${{ matrix.version }}_${{ matrix.artifact }}
56+
57+
chmod 777 *
58+
bash ./XEngine_LINEnv.sh -i 3
59+
cd ..
60+
61+
cd XEngine_Source
62+
gmake PLATFORM=freebsd RELEASE=1
63+
gmake PLATFORM=freebsd FLAGS=InstallAll
64+
gmake PLATFORM=freebsd FLAGS=CleanAll
65+
cd ..
66+
67+
cd XEngine_Release
68+
ARCH=$(uname -m)
69+
if [ "$ARCH" != "arm64" ]; then
70+
./XEngine_MQServiceApp -t
71+
fi
72+
73+
- name: Upload folder as artifact
74+
uses: actions/upload-artifact@v7
75+
with:
76+
name: XEngine_MQServiceApp-Ubuntu_22.04_x86-64
77+
path: XEngine_Release/
78+
retention-days: 1

‎.github/workflows/macbuild.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
strategy:
1919
matrix:
2020
include:
21-
- os: macos-26-intel
2221
- os: macos-26
2322
runs-on: ${{ matrix.os }}
2423

@@ -35,20 +34,8 @@ jobs:
3534
3635
- name: Set TERM variable
3736
run: echo "TERM=xterm" >> $GITHUB_ENV
38-
39-
- name: Set up Dependency x86_64 Environment
40-
if: matrix.os == 'macos-26-intel'
41-
run: |
42-
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)
43-
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_x86-64.zip
44-
unzip ./XEngine_Mac_x86-64.zip -d ./XEngine_Mac_x86-64
45-
cd XEngine_Mac_x86-64
46-
47-
chmod 777 *
48-
./XEngine_LINEnv.sh -i 3
4937

5038
- name: Set up Dependency Arm64 Environment
51-
if: matrix.os == 'macos-26'
5239
run: |
5340
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)
5441
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
@@ -75,15 +62,7 @@ jobs:
7562
cd XEngine_Release
7663
./XEngine_MQServiceApp -t
7764
78-
- name: Upload folder as artifact with mac x64
79-
if: matrix.os == 'macos-26-intel'
80-
uses: actions/upload-artifact@v7
81-
with:
82-
name: XEngine_MQServiceApp-Mac_x86_64
83-
path: XEngine_Release/
84-
retention-days: 1
8565
- name: Upload folder as artifact with mac arm
86-
if: matrix.os == 'macos-26'
8766
uses: actions/upload-artifact@v7
8867
with:
8968
name: XEngine_MQServiceApp-Mac_Arm64

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,15 @@ jobs:
7474
skip_unpack: true
7575
if_no_artifact_found: fail
7676
path: ./XRelease/
77+
- name: Download free bsd
78+
uses: dawidd6/action-download-artifact@v24
79+
with:
80+
workflow: freebsd_build.yml
81+
workflow_conclusion: success
82+
check_artifacts: false
83+
skip_unpack: true
84+
if_no_artifact_found: fail
85+
path: ./XRelease/
7786
- name: Download macbuild
7887
uses: dawidd6/action-download-artifact@v24
7988
with:

‎.github/workflows/suse_build.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ jobs:
3636
- name: Checkout main repository code
3737
uses: actions/checkout@v7
3838

39-
- name: Checkout dependency repository (xengine)
40-
uses: actions/checkout@v7
41-
with:
42-
repository: libxengine/libxengine
43-
path: libxengine
44-
4539
- name: sub module checkout (opensource)
4640
uses: actions/checkout@v7
4741
with:

0 commit comments

Comments
 (0)