Merge branch 'lich0821:master' into master
This commit is contained in:
CoderTyn
GitHub
commit
e1b9aa1444
@ -5,3 +5,6 @@ trim_trailing_whitespace = true
|
|||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|
||||||
|
[*.{yml,yaml}]
|
||||||
|
indent_size = 2
|
||||||
114
.github/workflows/Build-WeChatFerry.yml
vendored
114
.github/workflows/Build-WeChatFerry.yml
vendored
@ -1,114 +0,0 @@
|
|||||||
name: Build-WeChatFerry
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: windows-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: 检出代码
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: 获取版本号和微信版本号
|
|
||||||
run: |
|
|
||||||
$version_full = (Select-String -Path "WeChatFerry/spy/spy.rc" -Pattern 'VALUE "FileVersion", "(.*)"').Matches.Groups[1].Value.Trim()
|
|
||||||
$wechat_version = (Select-String -Path "WeChatFerry/spy/spy.rc" -Pattern 'VALUE "ProductVersion", "(.*)"').Matches.Groups[1].Value.Trim()
|
|
||||||
$version = $version_full -replace '(\d+\.\d+\.\d+)\.\d+', '$1'
|
|
||||||
echo "version=$version" >> $env:GITHUB_ENV
|
|
||||||
echo "wechat_version=$wechat_version" >> $env:GITHUB_ENV
|
|
||||||
echo "Program Version: $version"
|
|
||||||
echo "WeChat Version: $wechat_version"
|
|
||||||
shell: pwsh
|
|
||||||
|
|
||||||
- name: 设置 Visual Studio 2019
|
|
||||||
uses: microsoft/setup-msbuild@v2
|
|
||||||
with:
|
|
||||||
vs-version: "16.0" # 16.x 对应 Visual Studio 2019
|
|
||||||
|
|
||||||
- name: 设置 Python 3
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: "3.9"
|
|
||||||
|
|
||||||
- name: 安装 Python 依赖项
|
|
||||||
run: |
|
|
||||||
python -m pip install --upgrade pip
|
|
||||||
pip install grpcio-tools==1.48.2
|
|
||||||
|
|
||||||
- name: 设置缓存
|
|
||||||
id: cache-vcpkg
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
C:/Tools/vcpkg
|
|
||||||
${{ github.workspace }}/WeChatFerry/vcpkg_installed
|
|
||||||
key: vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }}
|
|
||||||
restore-keys: |
|
|
||||||
vcpkg-
|
|
||||||
|
|
||||||
- name: 安装 vcpkg 并初始化依赖项
|
|
||||||
run: |
|
|
||||||
# 设置 vcpkg 目录
|
|
||||||
if (!(Test-Path -Path 'C:/Tools')) {
|
|
||||||
New-Item -ItemType Directory -Force -Path 'C:/Tools'
|
|
||||||
}
|
|
||||||
cd C:/Tools
|
|
||||||
|
|
||||||
# 克隆并引导 vcpkg
|
|
||||||
if (!(Test-Path -Path 'C:/Tools/vcpkg')) {
|
|
||||||
git clone https://github.com/microsoft/vcpkg
|
|
||||||
}
|
|
||||||
.\vcpkg\bootstrap-vcpkg.bat
|
|
||||||
|
|
||||||
# 设置 VCPKG_ROOT 环境变量
|
|
||||||
echo "VCPKG_ROOT=C:/Tools/vcpkg" >> $GITHUB_ENV
|
|
||||||
$env:VCPKG_ROOT = 'C:/Tools/vcpkg'
|
|
||||||
|
|
||||||
# 返回到项目目录并安装依赖
|
|
||||||
cd ${{ github.workspace }}/WeChatFerry
|
|
||||||
C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static
|
|
||||||
|
|
||||||
# 将 vcpkg 与 Visual Studio 集成
|
|
||||||
C:/Tools/vcpkg/vcpkg integrate install
|
|
||||||
|
|
||||||
- name: 解析并构建配置
|
|
||||||
run: |
|
|
||||||
$configurations = "Release,Debug".Split(',')
|
|
||||||
foreach ($config in $configurations) {
|
|
||||||
Write-Host "Building configuration: $config"
|
|
||||||
msbuild WeChatFerry/WeChatFerry.sln `
|
|
||||||
/p:Configuration=$config `
|
|
||||||
/p:Platform="x64" `
|
|
||||||
/p:VcpkgTriplet="x64-windows-static" `
|
|
||||||
/p:VcpkgEnableManifest=true `
|
|
||||||
/verbosity:minimal
|
|
||||||
}
|
|
||||||
shell: pwsh
|
|
||||||
|
|
||||||
- name: 打包输出文件及下载 WeChat 安装包
|
|
||||||
run: |
|
|
||||||
New-Item -ItemType Directory -Force -Path "WeChatFerry/tmp"
|
|
||||||
Compress-Archive -Path "WeChatFerry/Out/sdk.dll", "WeChatFerry/Out/spy.dll", "WeChatFerry/Out/spy_debug.dll", "WeChatFerry/Out/DISCLAIMER.md" -DestinationPath "WeChatFerry/tmp/v${{ env.version }}.zip"
|
|
||||||
Invoke-WebRequest -Uri "https://github.com/tom-snow/wechat-windows-versions/releases/download/v${{ env.wechat_version }}/WeChatSetup-${{ env.wechat_version }}.exe" -OutFile "WeChatFerry/tmp/WeChatSetup-${{ env.wechat_version }}.exe"
|
|
||||||
shell: pwsh
|
|
||||||
|
|
||||||
- name: 列出预发布文件
|
|
||||||
run: |
|
|
||||||
Get-ChildItem -Path "WeChatFerry/tmp" -Recurse
|
|
||||||
|
|
||||||
- name: 发布固件到 Github Releases
|
|
||||||
uses: ncipollo/release-action@main
|
|
||||||
with:
|
|
||||||
name: v${{ env.version }}
|
|
||||||
tag: v${{ env.version }}
|
|
||||||
token: ${{ secrets.REPO_TOKEN }}
|
|
||||||
allowUpdates: true
|
|
||||||
artifacts: "WeChatFerry/tmp/*"
|
|
||||||
body: |
|
|
||||||
程序版本：`v${{ env.version }}`
|
|
||||||
配套微信版本：`${{ env.wechat_version }}`
|
|
||||||
[📖 Python 文档](https://wechatferry.readthedocs.io/)
|
|
||||||
75
.github/workflows/build-ci.yml
vendored
Normal file
75
.github/workflows/build-ci.yml
vendored
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
name: Build CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: 编译校验
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- name: 检出代码
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: 获取版本号和微信版本号
|
||||||
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
run: |
|
||||||
|
$version_full = (Select-String -Path "WeChatFerry/spy/spy.rc" -Pattern 'VALUE "FileVersion", "(.*)"').Matches.Groups[1].Value.Trim()
|
||||||
|
$wechat_version = (Select-String -Path "WeChatFerry/spy/spy.rc" -Pattern 'VALUE "ProductVersion", "(.*)"').Matches.Groups[1].Value.Trim()
|
||||||
|
$version = $version_full -replace '(\d+\.\d+\.\d+)\.\d+', '$1'
|
||||||
|
echo "version=$version" >> $env:GITHUB_ENV
|
||||||
|
echo "wechat_version=$wechat_version" >> $env:GITHUB_ENV
|
||||||
|
shell: pwsh
|
||||||
|
|
||||||
|
- name: 设置 Visual Studio 2019
|
||||||
|
uses: microsoft/setup-msbuild@v2
|
||||||
|
with:
|
||||||
|
vs-version: "16.0"
|
||||||
|
|
||||||
|
- name: 设置 Python 3
|
||||||
|
uses: actions/setup-python@v5
|
||||||
|
with:
|
||||||
|
python-version: "3.9"
|
||||||
|
|
||||||
|
- name: 安装 Python 依赖项
|
||||||
|
run: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install grpcio-tools==1.48.2
|
||||||
|
shell: pwsh
|
||||||
|
|
||||||
|
- name: 设置 vcpkg 缓存
|
||||||
|
id: cache-vcpkg
|
||||||
|
uses: actions/cache@v4
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
C:/Tools/vcpkg
|
||||||
|
${{ github.workspace }}/WeChatFerry/vcpkg_installed
|
||||||
|
key: vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }}
|
||||||
|
restore-keys: |
|
||||||
|
vcpkg-
|
||||||
|
|
||||||
|
- name: 安装 vcpkg 并初始化
|
||||||
|
run: |
|
||||||
|
if (!(Test-Path 'C:/Tools')) { New-Item -ItemType Directory -Force -Path 'C:/Tools' }
|
||||||
|
cd C:/Tools
|
||||||
|
if (!(Test-Path 'C:/Tools/vcpkg')) { git clone https://github.com/microsoft/vcpkg }
|
||||||
|
.\vcpkg\bootstrap-vcpkg.bat
|
||||||
|
echo "VCPKG_ROOT=C:/Tools/vcpkg" >> $GITHUB_ENV
|
||||||
|
cd ${{ github.workspace }}/WeChatFerry
|
||||||
|
C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static
|
||||||
|
C:/Tools/vcpkg/vcpkg integrate install
|
||||||
|
shell: pwsh
|
||||||
|
|
||||||
|
- name: 解析并构建 Release/Debug
|
||||||
|
run: |
|
||||||
|
$configs = "Release","Debug"
|
||||||
|
foreach ($cfg in $configs) {
|
||||||
|
Write-Host "Building $cfg"
|
||||||
|
msbuild WeChatFerry/WeChatFerry.sln `
|
||||||
|
/p:Configuration=$cfg `
|
||||||
|
/p:Platform="x64" `
|
||||||
|
/p:VcpkgTriplet="x64-windows-static" `
|
||||||
|
/p:VcpkgEnableManifest=true `
|
||||||
|
/verbosity:minimal
|
||||||
|
}
|
||||||
|
shell: pwsh
|
||||||
14
.github/workflows/ci.yml
vendored
Normal file
14
.github/workflows/ci.yml
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
name: CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
uses: ./.github/workflows/build-ci.yml
|
||||||
49
.github/workflows/release.yml
vendored
Normal file
49
.github/workflows/release.yml
vendored
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v[0-9]+.[0-9]+.[0-9]+"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
actions: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
uses: ./.github/workflows/build-ci.yml
|
||||||
|
|
||||||
|
release:
|
||||||
|
name: 打包 & 发布
|
||||||
|
needs: build
|
||||||
|
runs-on: windows-latest
|
||||||
|
# 仅当触发源是 push 且是 Tag 时才执行
|
||||||
|
if: ${{ github.event_name == 'push' }}
|
||||||
|
steps:
|
||||||
|
- name: 检出代码
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: 打包输出文件及下载 WeChat 安装包
|
||||||
|
run: |
|
||||||
|
New-Item -ItemType Directory -Force -Path "WeChatFerry/tmp"
|
||||||
|
Compress-Archive -Path "WeChatFerry/Out/sdk.dll", "WeChatFerry/Out/spy.dll", "WeChatFerry/Out/spy_debug.dll", "WeChatFerry/Out/DISCLAIMER.md" -DestinationPath "WeChatFerry/tmp/v${{ env.version }}.zip"
|
||||||
|
Invoke-WebRequest -Uri "https://github.com/tom-snow/wechat-windows-versions/releases/download/v${{ env.wechat_version }}/WeChatSetup-${{ env.wechat_version }}.exe" -OutFile "WeChatFerry/tmp/WeChatSetup-${{ env.wechat_version }}.exe"
|
||||||
|
shell: pwsh
|
||||||
|
|
||||||
|
- name: 列出待发布文件
|
||||||
|
run: |
|
||||||
|
Get-ChildItem -Path "WeChatFerry/tmp" -Recurse
|
||||||
|
shell: pwsh
|
||||||
|
|
||||||
|
- name: 发布到 GitHub Releases
|
||||||
|
uses: ncipollo/release-action@main
|
||||||
|
with:
|
||||||
|
name: v${{ env.version }}
|
||||||
|
tag: v${{ env.version }}
|
||||||
|
token: ${{ secrets.REPO_TOKEN }}
|
||||||
|
allowUpdates: true
|
||||||
|
artifacts: "WeChatFerry/tmp/*"
|
||||||
|
body: |
|
||||||
|
程序版本：`v${{ env.version }}`
|
||||||
|
配套微信版本：`${{ env.wechat_version }}`
|
||||||
|
[📖 Python 文档](https://wechatferry.readthedocs.io/)
|
||||||
Loading…
Reference in New Issue
Block a user