fix: 板子锁 ID 用 per-board 默认,容器名自动拼入 org/repo#4
Open
yoinspiration wants to merge 1 commit intoarceos-hypervisor:mainfrom
Open
fix: 板子锁 ID 用 per-board 默认,容器名自动拼入 org/repo#4yoinspiration wants to merge 1 commit intoarceos-hypervisor:mainfrom
yoinspiration wants to merge 1 commit intoarceos-hypervisor:mainfrom
Conversation
- 板子锁 ID:有定义用定义的,否则用该板默认值(board-phytiumpi/board-roc-rk3568-pc),不再回退到 RUNNER_RESOURCE_ID - 容器名前缀:未设置时自动拼入 ORG/REPO(hostname-org- 或 hostname-org-repo-),避免多副本重名 - compose:无现有容器时 generic_count 下限为 0,避免出现 -2 - 新增 verify-changes.sh 用于回归验证上述逻辑 - 更新 .env.example、README/README_CN 说明 Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
背景
按审核意见完善以下两点。
1. 硬件开发板锁 ID:有定义用定义的,否则用默认值
RUNNER_RESOURCE_ID_PHYTIUMPI未设置时回退到RUNNER_RESOURCE_ID,所有板子共一把锁,导致无法并行。RUNNER_RESOURCE_ID:board-phytiumpiboard-roc-rk3568-pc2. 容器命名:主机名 + org(+ repo)+ runner_xxx
主机名+runner_xxx,多副本执行时容器重名。RUNNER_NAME_PREFIX时自动拼入 ORG/REPO:<hostname>-<org>-runner-xxx<hostname>-<org>-<repo>-runner-xxxRUNNER_NAME_PREFIX时以该值为前缀(如custom→ 容器名custom-runner-1);未以-结尾时脚本会自动补上。其他
compose无现有容器时generic_count下限为 0,避免出现 “-2 existing runners”。verify-changes.sh用于回归验证上述逻辑(可选运行./verify-changes.sh)。RUNNER_NAME_PREFIX的说明。验证
./verify-changes.sh通过。./runner.sh compose生成 docker-compose.yml,确认板子锁 ID 与 container_name 符合预期。