Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 95 additions & 0 deletions .github/workflows/Alma_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
name: alma build workflows

on:
push:
branches:
- 'develop'
paths:
- 'XEngine_Source/**'
- 'XEngine_Release/**'
- '.github/**'

permissions:
contents: read

jobs:
build:
runs-on: ${{ matrix.runner }}
container:
image: almalinux:${{ matrix.version }}
options: --platform ${{ matrix.platform }}
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
version: 9
- arch: amd64
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
version: 10
- arch: arm64
runner: ubuntu-24.04-arm
platform: linux/arm64
artifact: Arm64
version: 9
- arch: arm64
runner: ubuntu-24.04-arm
platform: linux/arm64
artifact: Arm64
version: 10

steps:
- name: Checkout main repository code
uses: actions/checkout@v4

- name: Checkout dependency repository (xengine)
uses: actions/checkout@v4
with:
repository: libxengine/libxengine
path: libxengine

- name: sub module checkout (opensource)
uses: actions/checkout@v4
with:
repository: libxengine/XEngine_OPenSource
path: XEngine_Source/XEngine_DependLibrary

- name: Set TERM variable
run: echo "TERM=xterm" >> $GITHUB_ENV

- name: install system package
run: |
dnf update -y
dnf install gcc g++ make git jq unzip wget -y

- name: install xengine library
run: |
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}

chmod 777 *
./XEngine_LINEnv.sh -i 3

- name: make
run: |
cd XEngine_Source
make RELEASE=1
make FLAGS=InstallAll
make FLAGS=CleanAll
cd ..
- name: test
run: |
cd XEngine_Release
./XEngine_MQServiceApp -t

- name: Upload folder as artifact
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-AlmaLinux_${{ matrix.version }}_${{ matrix.artifact }}
path: XEngine_Release/
102 changes: 102 additions & 0 deletions .github/workflows/Centos_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
name: centos build workflows

on:
push:
branches:
- 'develop'
paths:
- 'XEngine_Source/**'
- 'XEngine_Release/**'
- '.github/**'

permissions:
contents: read

jobs:
build:
runs-on: ${{ matrix.runner }}
container:
image: quay.io/centos/centos:${{ matrix.stream }}
options: --platform ${{ matrix.platform }}
strategy:
matrix:
include:
- arch: amd64
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
version: 9
stream: stream9
- arch: amd64
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
version: 10
stream: stream10
- arch: arm64
runner: ubuntu-24.04-arm
platform: linux/arm64
artifact: Arm64
version: 9
stream: stream9
- arch: arm64
runner: ubuntu-24.04-arm
platform: linux/arm64
artifact: Arm64
version: 10
stream: stream10

steps:
- name: Checkout main repository code
uses: actions/checkout@v4

- name: Checkout dependency repository (xengine)
uses: actions/checkout@v4
with:
repository: libxengine/libxengine
path: libxengine

- name: sub module checkout (opensource)
uses: actions/checkout@v4
with:
repository: libxengine/XEngine_OPenSource
path: XEngine_Source/XEngine_DependLibrary

- name: install system package
run: |
dnf update -y
dnf install gcc g++ make git jq unzip wget -y

- name: Set TERM variable
run: echo "TERM=xterm" >> $GITHUB_ENV

- name: install xengine library
run: |
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip
unzip ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
cd XEngine_RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}

chmod 777 *
./XEngine_LINEnv.sh -i 3
- name: make
run: |
cd XEngine_Source
make
make FLAGS=InstallAll
make FLAGS=CleanAll

make RELEASE=1
make FLAGS=InstallAll
make FLAGS=CleanAll
- name: test
run: |
cd XEngine_Release
./XEngine_MQServiceApp -t

- name: Upload folder as artifact with CentOS
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
path: XEngine_Release/
retention-days: 1
4 changes: 2 additions & 2 deletions .github/workflows/Rocky_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ jobs:
cd XEngine_Release
./XEngine_MQServiceApp -t

- name: Upload folder as artifact with RockyLinux
- name: Upload folder as artifact with CentOS
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-RockyLinux_${{ matrix.version }}_${{ matrix.artifact }}
name: XEngine_MQServiceApp-CentOS_${{ matrix.version }}_${{ matrix.artifact }}
path: XEngine_Release/
retention-days: 1
22 changes: 13 additions & 9 deletions .github/workflows/debian_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
build:
runs-on: ${{ matrix.runner }}
container:
image: debian:bookworm
image: debian:${{ matrix.name }}
options: --platform ${{ matrix.platform }}
strategy:
matrix:
Expand All @@ -25,6 +25,14 @@ jobs:
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
name: bookworm
version: 12
- arch: amd64
runner: ubuntu-24.04
platform: linux/amd64
artifact: x86-64
name: trixie
version: 13

steps:
- name: Checkout main repository code
Expand Down Expand Up @@ -53,20 +61,16 @@ jobs:
- name: install xengine library
run: |
latest_tag=$(curl -s https://api.github.com/repos/libxengine/libxengine/releases/latest | jq -r .tag_name)
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_12_${{ matrix.artifact }}.zip
unzip ./XEngine_Debian_12_${{ matrix.artifact }}.zip -d ./XEngine_Debian_12_${{ matrix.artifact }}
cd XEngine_Debian_12_${{ matrix.artifact }}
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip
unzip ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}.zip -d ./XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}
cd XEngine_Debian_${{ matrix.version }}_${{ matrix.artifact }}

chmod 777 *
./XEngine_LINEnv.sh -i 3

- name: make
run: |
cd XEngine_Source
make
make FLAGS=InstallAll
make FLAGS=CleanAll

make RELEASE=1
make FLAGS=InstallAll
make FLAGS=CleanAll
Expand All @@ -79,6 +83,6 @@ jobs:
- name: Upload folder as artifact
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-Debian_12_x86-64
name: XEngine_MQServiceApp-Debian_${{ matrix.version }}_x86-64
path: XEngine_Release/
retention-days: 1
12 changes: 6 additions & 6 deletions .github/workflows/macbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
strategy:
matrix:
include:
- os: macos-13
- os: macos-14
- os: macos-15-intel
- os: macos-15
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -42,13 +42,13 @@ jobs:
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"

- name: Set up Dependency x86_64 Environment
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15-intel'
run: |
cd libxengine
chmod 777 *
./XEngine_LINEnv.sh -i 3
- name: Set up Dependency Arm64 Environment
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
run: |
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)
wget https://github.com/libxengine/libxengine/releases/download/$latest_tag/XEngine_Mac_Arm64.zip
Expand Down Expand Up @@ -76,14 +76,14 @@ jobs:
./XEngine_MQServiceApp -t

- name: Upload folder as artifact with mac x64
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15-intel'
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-Mac_x86_64
path: XEngine_Release/
retention-days: 1
- name: Upload folder as artifact with mac arm
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
uses: actions/upload-artifact@v4
with:
name: XEngine_MQServiceApp-Mac_Arm64
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,24 @@ jobs:
skip_unpack: true
if_no_artifact_found: fail
path: ./XRelease/
- name: Download CentOS
uses: dawidd6/action-download-artifact@v6
with:
workflow: Centos_build.yml
workflow_conclusion: success
check_artifacts: false
skip_unpack: true
if_no_artifact_found: fail
path: ./XRelease/
- name: Download Alma
uses: dawidd6/action-download-artifact@v6
with:
workflow: Alma_build.yml
workflow_conclusion: success
check_artifacts: false
skip_unpack: true
if_no_artifact_found: fail
path: ./XRelease/
- name: Download macbuild
uses: dawidd6/action-download-artifact@v6
with:
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
XEngine_MQService V3.18.0.1001

ci:增加CentOS和Alma以及debian13系统支持
ci:更新mac系统版本
修改:启动参数不区分大小写了
修改:用户数据缓冲区大小问题
更新:匹配最新协议模块
更新:依赖库
修正:某些时候读取配置文件内存问题

ci:add centos alma linux and debian 13 system support
ci:update mac system version
modify:does not case sensitive for start parameter
modify:user data memory size
update:match last version source module protocol
update:depend library
fixed:read configure memory leak
======================================================================================
XEngine_MQService V3.17.0.1001

增加:rocky linux 10 支持
Expand Down
2 changes: 1 addition & 1 deletion XEngine_Apps/MQCore_TCPApp/MQCore_TCPApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void MQ_Authorize()

st_ProtocolHdr.wHeader = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_HEADER;
st_ProtocolHdr.unOperatorType = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQUSERLOG;
st_ProtocolHdr.unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
st_ProtocolHdr.byVersion = 1;
st_ProtocolHdr.byIsReply = true; //获得处理返回结果
st_ProtocolHdr.wTail = XENGIEN_COMMUNICATION_PACKET_PROTOCOL_TAIL;
Expand Down
2 changes: 1 addition & 1 deletion XEngine_Apps/MQCore_WSApp/MQCore_WSApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void MQ_Authorize()
Json::Value st_JsonRoot;
Json::Value st_JsonAuth;
st_JsonRoot["unOperatorType"] = ENUM_XENGINE_COMMUNICATION_PROTOCOL_TYPE_AUTH;
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REQUSERLOG;
st_JsonRoot["unOperatorCode"] = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_AUTH_REQLOGIN;
st_JsonRoot["byVersion"] = ENUM_XENGINE_PROTOCOLHDR_PAYLOAD_TYPE_JSON;

st_JsonAuth["tszUserName"] = "123123aa";
Expand Down
Loading
Loading