Skip to content

Commit 27855a7

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #22 from libxengine/develop
Merge V1.10.0.1001
2 parents 82211e5 + 7077654 commit 27855a7

File tree

23 files changed

+397
-43
lines changed

23 files changed

+397
-43
lines changed

‎.github/workflows/issue-translator.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Issue Translator
2+
on:
3+
issue_comment:
4+
types: [created]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: usthe/[email protected]
13+
with:
14+
IS_MODIFY_TITLE: true
15+
CUSTOM_BOT_NOTE: Bot detected the issue body's language is not English, translate it automatically.

‎.github/workflows/linuxbuild.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: ubuntu build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
86

97
permissions:
108
contents: read
@@ -61,4 +59,10 @@ jobs:
6159
- name: test
6260
run: |
6361
cd XEngine_Release
64-
./XEngine_ProxyServiceApp -t
62+
./XEngine_ProxyServiceApp -t
63+
64+
- name: Upload folder as artifact with ubuntu
65+
uses: actions/upload-artifact@v4
66+
with:
67+
name: XEngine_ProxyServiceApp-x64-Ubuntu
68+
path: XEngine_Release/

‎.github/workflows/macbuild.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ name: macos build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
86

97
permissions:
108
contents: read
@@ -29,6 +27,7 @@ jobs:
2927
with:
3028
repository: libxengine/libxengine
3129
path: libxengine
30+
ref: 'master'
3231

3332
- name: sub module checkout (opensource)
3433
run: |
@@ -62,3 +61,9 @@ jobs:
6261
run: |
6362
cd XEngine_Release
6463
./XEngine_ProxyServiceApp -t
64+
65+
- name: Upload folder as artifact with mac
66+
uses: actions/upload-artifact@v4
67+
with:
68+
name: XEngine_ProxyServiceApp-x64-Mac
69+
path: XEngine_Release/

‎.github/workflows/msbuild.yml‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: windows build workflows
33
on:
44
push:
55
branches: [ "develop" ]
6-
pull_request:
7-
branches: [ "develop" ]
8-
6+
97
permissions:
108
contents: read
119

@@ -65,13 +63,27 @@ jobs:
6563
./VSCopy_x86.bat
6664
./XEngine_ServiceApp.exe -t
6765
shell: pwsh
68-
- name: Conditional Step for x86 Debug
69-
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
66+
- name: Conditional Step for x64 Release
67+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
7068
run: |
71-
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
72-
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
73-
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
69+
cp -r XEngine_Source/x64/Release/*.dll XEngine_Release/
70+
cp -r XEngine_Source/x64/Release/*.exe XEngine_Release/
71+
cp -r XEngine_Source/VSCopy_x64.bat XEngine_Release/
7472
cd XEngine_Release
75-
./VSCopy_x86.bat
76-
./XEngine_ServiceApp.exe -t
73+
./VSCopy_x64.bat
7774
shell: pwsh
75+
76+
#将文件夹打包为 artifact
77+
- name: Upload folder as artifact with x86
78+
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
79+
uses: actions/upload-artifact@v4
80+
with:
81+
name: XEngine_ProxyServiceApp-x86-Windows
82+
path: XEngine_Release/
83+
84+
- name: Upload folder as artifact with x64
85+
if: matrix.configuration == 'Release' && matrix.platform == 'x64'
86+
uses: actions/upload-artifact@v4
87+
with:
88+
name: XEngine_ProxyServiceApp-x64-Windows
89+
path: XEngine_Release/

‎.github/workflows/release.yml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: release packet
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
# 检出代码并包含标签
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Download linuxbuild
20+
uses: dawidd6/action-download-artifact@v6
21+
with:
22+
workflow: linuxbuild.yml
23+
workflow_conclusion: success
24+
check_artifacts: false
25+
skip_unpack: true
26+
if_no_artifact_found: fail
27+
path: ./
28+
- name: Download macbuild
29+
uses: dawidd6/action-download-artifact@v6
30+
with:
31+
workflow: macbuild.yml
32+
workflow_conclusion: success
33+
check_artifacts: false
34+
skip_unpack: true
35+
if_no_artifact_found: fail
36+
path: ./
37+
- name: Download msbuild
38+
uses: dawidd6/action-download-artifact@v6
39+
with:
40+
workflow: msbuild.yml
41+
workflow_conclusion: success
42+
check_artifacts: false
43+
skip_unpack: true
44+
if_no_artifact_found: fail
45+
path: ./
46+
47+
- name: Display structure of downloaded files
48+
run: ls -al ./
49+
50+
# 获取最新的标签并提取 X 部分
51+
- name: Get current version and increment X
52+
id: versioning
53+
run: |
54+
# 获取最新的标签，假设标签形式为 V1.X.0.1001
55+
latest_tag=$(git describe --tags `git rev-list --tags --max-count=1`)
56+
echo "Latest tag: $latest_tag"
57+
# 提取 X 的值并递增
58+
major=$(echo $latest_tag | cut -d '.' -f 1)
59+
minor=$(echo $latest_tag | cut -d '.' -f 2)
60+
patch=$(echo $latest_tag | cut -d '.' -f 3)
61+
build=$(echo $latest_tag | cut -d '.' -f 4)
62+
63+
new_minor=$((minor + 1))
64+
new_version="$major.$new_minor.$patch.$build"
65+
echo "New version: $new_version"
66+
echo "new_tag=$new_version" >> $GITHUB_OUTPUT
67+
echo "prev_tag=$latest_tag" >> $GITHUB_OUTPUT
68+
69+
# 创建并推送新的 Git 标签
70+
- name: Create and push new tag
71+
run: |
72+
git tag ${{ steps.versioning.outputs.new_tag }}
73+
git push origin ${{ steps.versioning.outputs.new_tag }}
74+
75+
- name: Generate release notes
76+
run: |
77+
# 获取当前标签和上一个标签之间的提交列表，包括提交人的电子邮件
78+
logs=$(git log ${{ steps.versioning.outputs.prev_tag }}..${{ steps.versioning.outputs.new_tag }} --pretty=format:"* %H - %s - %an" --no-merges)
79+
release_notes=$(echo "$logs" | sed 's/ - qyt$/ - @xengine-qyt/')
80+
echo "release_notes=$release_notes" >> $GITHUB_ENV
81+
82+
- name: Release
83+
uses: softprops/action-gh-release@v2
84+
env:
85+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86+
with:
87+
draft: false
88+
prerelease: false
89+
tag_name: ${{ steps.versioning.outputs.new_tag }}
90+
name: XEngine_ProxyServiceApp ${{ steps.versioning.outputs.new_tag }}
91+
body: ${{ env.release_notes }}
92+
files: |
93+
./XEngine_ProxyServiceApp-x64-Mac.zip
94+
./XEngine_ProxyServiceApp-x64-Ubuntu.zip
95+
./XEngine_ProxyServiceApp-x64-Windows.zip
96+
./XEngine_ProxyServiceApp-x86-Windows.zip

‎CHANGELOG‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
XEngine_ProxyServer V1.10.0.1001
2+
3+
增加:WINDOWS COREDUMP支持
4+
增加:工作流支持
5+
增加:启动测试参数
6+
优化:启动参数解析
7+
修改:启动测试的时候关闭报告
8+
修改:forward转发的绑定修改为命名绑定,并且增加了匿名绑定支持
9+
修正:子模块文件件不正确的问题
10+
修正:MACOS下编译问题
11+
修正:某些时候退出崩溃
12+
修正:forward删除目标客户端导致的问题
13+
删除:getchar 函数启动的时候
14+
15+
added:crash core-dump support for windows
16+
added:workflows
17+
added:test start mode parameter
18+
improved:start parameter parse
19+
modify:disable report info when test start
20+
modify:bind modify to named and add anonymous for forward of bind
21+
fixed:sub module dir is incorrect
22+
fixed:make build error on mac
23+
fixed:crashed when exist
24+
fixed:delete dest client for forward
25+
delete:getchar() when test start
26+
======================================================================================
127
XEngine_ProxyServer V1.9.0.1001
228

329
增加:XENGINE版本处理和退出等待功能

‎XEngine_Docment/Docment_en.docx‎

3.24 KB
Binary file not shown.

‎XEngine_Docment/Docment_zh.docx‎

3.17 KB
Binary file not shown.

‎XEngine_Release/XEngine_Config/XEngine_Version.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"XVer": [
3+
"1.10.0.1001 Build20241115",
34
"1.9.0.1001 Build20240910",
45
"1.8.0.1001 Build20240522",
56
"1.7.1.1001 Build20240305",

XEngine_Release/XEngine_Log/.gitignore renamed to XEngine_Release/XEngine_Coredump/keepfile

File renamed without changes.

0 commit comments

Comments
 (0)