Skip to content

Commit a3beaf9

Browse files
committed
[完善CI/CD配置并修复构建系统问题]: 增强GitHub Actions的依赖管理和工作流配置,修复qmake架构检测逻辑,更新vcpkg依赖基线
- **构建工具链增强**: 在GitHub Actions的依赖安装步骤中添加autoconf、autoconf-archive、automake和libtool等构建工具,确保完整的编译环境 - **工作流配置优化**: 重构delete_workflow.yml工作流,改进输入参数描述、默认值和选项配置,提升工作流删除操作的灵活性和可用性 - **架构检测修复**: 修正qmake架构检测文件中的变量计数问题,将`$$val`改为`$$eval`,确保Apple设备架构正确识别和计数 - **依赖管理更新**: 更新vcpkg.json中的builtin-baseline到新版本,同步最新的第三方库依赖和修复,保持项目依赖的时效性
1 parent bf4e6f4 commit a3beaf9

4 files changed

Lines changed: 26 additions & 20 deletions

File tree

.github/actions/install-dependencies/action.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ runs:
8484
run: |
8585
sudo apt-get update
8686
sudo apt-get install ninja-build build-essential libgl1-mesa-dev clang \
87-
libltdl-dev libxi-dev libxtst-dev libx11-dev libxft-dev libxext-dev libxrandr-dev
87+
libltdl-dev libxi-dev libxtst-dev libx11-dev libxft-dev libxext-dev libxrandr-dev \
88+
autoconf autoconf-archive automake libtool
8889
ninja --version
8990
cmake --version
9091
gcc --version

.github/workflows/delete_workflow.yml

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ on:
33
workflow_dispatch:
44
inputs:
55
days:
6-
description: 'Days-worth of runs to keep for each workflow'
6+
description: "Days to retain runs"
77
required: true
8-
default: '30'
8+
default: "30"
99
minimum_runs:
10-
description: 'Minimum runs to keep for each workflow'
10+
description: "Minimum runs to keep"
1111
required: true
12-
default: '6'
12+
default: "6"
1313
delete_workflow_pattern:
14-
description: 'Name or filename of the workflow (if not set, all workflows are targeted)'
14+
description: "Workflow name or filename (omit for all). Use `|` to separate multiple filters (e.g. 'build|deploy')."
1515
required: false
1616
delete_workflow_by_state_pattern:
17-
description: 'Filter workflows by state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually'
18-
required: true
17+
description: "Workflow state: active, deleted, disabled_fork, disabled_inactivity, disabled_manually"
18+
required: false
1919
default: "ALL"
2020
type: choice
2121
options:
@@ -25,8 +25,8 @@ on:
2525
- disabled_inactivity
2626
- disabled_manually
2727
delete_run_by_conclusion_pattern:
28-
description: 'Remove runs based on conclusion: action_required, cancelled, failure, skipped, success'
29-
required: true
28+
description: "Run conclusion: action_required, cancelled, failure, skipped, success"
29+
required: false
3030
default: "Unsuccessful: action_required,cancelled,failure,skipped"
3131
type: choice
3232
options:
@@ -38,14 +38,19 @@ on:
3838
- skipped
3939
- success
4040
dry_run:
41-
description: 'Logs simulated changes, no deletions are performed'
41+
description: "Simulate deletions"
4242
required: false
43-
43+
default: "false"
44+
type: choice
45+
options:
46+
- "false"
47+
- "true"
4448
jobs:
45-
delete-workflow-runs:
49+
delete-runs:
4650
runs-on: ubuntu-latest
4751
permissions:
4852
actions: write
53+
contents: read
4954
steps:
5055
- name: Delete workflow runs
5156
uses: Mattraks/delete-workflow-runs@v2
@@ -58,8 +63,8 @@ jobs:
5863
delete_workflow_by_state_pattern: ${{ github.event.inputs.delete_workflow_by_state_pattern }}
5964
delete_run_by_conclusion_pattern: >-
6065
${{
61-
startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:')
62-
&& 'action_required,cancelled,failure,skipped'
63-
|| github.event.inputs.delete_run_by_conclusion_pattern
66+
startsWith(github.event.inputs.delete_run_by_conclusion_pattern, 'Unsuccessful:') &&
67+
'action_required,cancelled,failure,skipped' ||
68+
github.event.inputs.delete_run_by_conclusion_pattern
6469
}}
65-
dry_run: ${{ github.event.inputs.dry_run }}
70+
dry_run: ${{ github.event.inputs.dry_run }}

qmake/ArchitectureDetection.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ defineReplace(detect_architecture) {
7676
for(arch, QMAKE_APPLE_DEVICE_ARCHS) {
7777
normalized_arch = $$normalize_arch_name($$arch)
7878
is_valid_architecture($$arch) {
79-
valid_arch_count = $$val(valid_arch_count) + 1
79+
valid_arch_count = $$eval(valid_arch_count) + 1
8080
supported_archs = $$supported_archs $$normalized_arch
8181
} else {
8282
message("Warning: Unsupported architecture '$$arch' in QMAKE_APPLE_DEVICE_ARCHS")

vcpkg.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
]
2626
}
2727
],
28-
"builtin-baseline": "73af4de996897cb45dcf5034d16a551a3cf476f7"
29-
}
28+
"builtin-baseline": "e3ed41868d5034bc608eaaa58383cd6ecdbb5ffb"
29+
}

0 commit comments

Comments
 (0)