Skip to content

Commit adbae30

Browse files
committed
更新构建配置,添加Perl安装步骤并调整OpenSSL依赖
1 parent 1905a48 commit adbae30

5 files changed

Lines changed: 22 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,11 @@ jobs:
4444
with:
4545
targets: ${{ matrix.target }}
4646

47-
- name: Install dependencies (macOS)
48-
if: runner.os == 'macOS'
49-
run: |
50-
rustup target add ${{ matrix.target }}
51-
brew install openssl@3
52-
echo "OPENSSL_DIR=$(brew --prefix openssl@3)" >> $GITHUB_ENV
53-
54-
- name: Install OpenSSL (Windows)
47+
- name: Install Perl (Windows, for OpenSSL vendored build)
5548
if: runner.os == 'Windows'
56-
run: |
57-
vcpkg install openssl:x64-windows
58-
echo "OPENSSL_DIR=C:\vcpkg\installed\x64-windows" >> $env:GITHUB_ENV
59-
echo "OPENSSL_LIB_DIR=C:\vcpkg\installed\x64-windows\lib" >> $env:GITHUB_ENV
60-
echo "OPENSSL_INCLUDE_DIR=C:\vcpkg\installed\x64-windows\include" >> $env:GITHUB_ENV
49+
uses: shogo82148/actions-setup-perl@v1
50+
with:
51+
perl-version: '5.38'
6152

6253
- name: Install frontend dependencies
6354
run: npm install
@@ -68,7 +59,7 @@ jobs:
6859
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6960
with:
7061
tagName: ${{ github.ref_name }}
71-
releaseName: '批量CSR生成器 ${{ github.ref_name }}'
62+
releaseName: 'Batch-CSR-Generator ${{ github.ref_name }}'
7263
releaseBody: '请查看 CHANGELOG.md 了解更新内容。'
7364
releaseDraft: true
7465
prerelease: false

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/src-tauri/target/
22
/.idea/
3+
/node_modules/

src-tauri/Cargo.lock

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tauri-plugin-shell = "2"
1919
serde = { version = "1", features = ["derive"] }
2020
serde_json = "1"
2121
# CSR生成 - 使用openssl
22-
openssl = "0.10"
22+
openssl = { version = "0.10", features = ["vendored"] }
2323
# CSV处理
2424
csv = "1.3"
2525
# 正则表达式

src-tauri/tauri.conf.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
3-
"productName": "批量CSR生成器",
3+
"productName": "Batch-CSR-Generator",
44
"version": "1.0.0",
55
"identifier": "com.csr.batch-generator",
66
"build": {
@@ -37,7 +37,10 @@
3737
"windows": {
3838
"certificateThumbprint": null,
3939
"digestAlgorithm": "sha256",
40-
"timestampUrl": ""
40+
"timestampUrl": "",
41+
"wix": {
42+
"language": "zh-CN"
43+
}
4144
},
4245
"macOS": {
4346
"minimumSystemVersion": "10.13"

0 commit comments

Comments
 (0)