feat: add x86_64 board runner

Author: Josen-B

.env.example

@@ -24,6 +24,7 @@ GH_PAT=
 # 多组织共享同一块板时显式设相同 ID：
 # RUNNER_RESOURCE_ID_PHYTIUMPI=board-phytiumpi
 # RUNNER_RESOURCE_ID_ROC_RK3568_PC=board-roc-rk3568-pc
+# RUNNER_RESOURCE_ID_X86_64=board-x86_64
 # RUNNER_LOCK_DIR=/tmp/github-runner-locks
 # RUNNER_LOCK_HOST_PATH=/tmp/github-runner-locks
 

README.md

@@ -54,7 +54,7 @@ cp .env.example .env
 | `./runner.sh rm [runner-<id> ...] [-y]` | Unregister and remove containers; `-y` skips confirmation |
 | `./runner.sh purge [-y]` | Remove containers and generated files (`docker-compose.yml`, caches, etc.) |
 
-> **Note**: The `init` command creates two hardware-based runners (phytiumpi and roc-rk3568-pc) by default. This behavior is not controlled by the `-n` parameter.
+> **Note**: The `init` command creates three hardware-based runners (phytiumpi, roc-rk3568-pc, and x86_64-pc) by default. This behavior is not controlled by the `-n` parameter.
 
 ## Configuration
 
@@ -68,7 +68,7 @@ The default prefix automatically includes `ORG` (and `REPO` if set), formatted a
 name:label1[,label2];name2:label1
 ```
 
-Example: `phytiumpi:arm64,phytiumpi;roc-rk3568-pc:arm64,roc-rk3568-pc`
+Example: `phytiumpi:arm64,phytiumpi;roc-rk3568-pc:arm64,roc-rk3568-pc;x86_64-pc:x86_64`
 
 Board instances will only use labels defined in `BOARD_RUNNERS` and will not append global `RUNNER_LABELS`.
 
@@ -98,7 +98,7 @@ When multiple containers need to access the same physical hardware, concurrent j
 
 ### Configuration
 
-When using environments generated by **runner.sh**, board runners have the wrapper enabled by default with the shared lock directory `/tmp/github-runner-locks` mounted. Board-level environment variables (e.g., `RUNNER_RESOURCE_ID_PHYTIUMPI`) take priority; otherwise, default values are used (phytiumpi: `board-phytiumpi`, roc-rk3568-pc: `board-roc-rk3568-pc`).
+When using environments generated by **runner.sh**, board runners have the wrapper enabled by default with the shared lock directory `/tmp/github-runner-locks` mounted. Board-level environment variables (e.g., `RUNNER_RESOURCE_ID_PHYTIUMPI`) take priority; otherwise, default values are used (phytiumpi: `board-phytiumpi`, roc-rk3568-pc: `board-roc-rk3568-pc`, x86_64-pc: `board-x86_64-pc`).
 
 To **share the same board across multiple organizations**, simply set the same lock ID for that board in each `.env` file. This ensures that even if runner containers from both organizations receive jobs simultaneously, they will queue via file locks to avoid hardware conflicts.
 

README_CN.md

@@ -54,7 +54,7 @@ cp .env.example .env
 | `./runner.sh rm [runner-<id> ...] [-y]` | 取消注册并删除容器；`-y` 跳过确认 |
 | `./runner.sh purge [-y]` | 删除容器并移除生成文件（`docker-compose.yml`、缓存等） |
 
-> **注意**：`init` 命令默认会创建两个基于硬件的 Runner（phytiumpi 和 roc-rk3568-pc），此行为不受 `-n` 参数控制。
+> **注意**：`init` 命令默认会创建三个基于硬件的 Runner（phytiumpi、roc-rk3568-pc 和 x86_64），此行为不受 `-n` 参数控制。
 
 ## 配置说明
 
@@ -68,7 +68,7 @@ cp .env.example .env
 name:label1[,label2];name2:label1
 ```
 
-示例：`phytiumpi:arm64,phytiumpi;roc-rk3568-pc:arm64,roc-rk3568-pc`
+示例：`phytiumpi:arm64,phytiumpi;roc-rk3568-pc:arm64,roc-rk3568-pc;x86_64:x86_64`
 
 开发板实例将仅使用 `BOARD_RUNNERS` 中定义的标签，不会追加全局 `RUNNER_LABELS`。
 
@@ -98,7 +98,7 @@ name:label1[,label2];name2:label1
 
 ### 配置方法
 
-使用 **runner.sh** 生成的环境，板子 runner 默认启用 wrapper 并挂载共享锁目录 `/tmp/github-runner-locks`。优先使用板子级环境变量（如 `RUNNER_RESOURCE_ID_PHYTIUMPI`），否则使用默认值（phytiumpi: `board-phytiumpi`，roc-rk3568-pc: `board-roc-rk3568-pc`）。
+使用 **runner.sh** 生成的环境，板子 runner 默认启用 wrapper 并挂载共享锁目录 `/tmp/github-runner-locks`。优先使用板子级环境变量（如 `RUNNER_RESOURCE_ID_PHYTIUMPI`），否则使用默认值（phytiumpi: `board-phytiumpi`，roc-rk3568-pc: `board-roc-rk3568-pc`，x86_64-pc: `board-x86_64-pc`）。
 
 如果要在**多组织中共享同一块板时**，则只需要在各自的 `.env` 中为该板设置相同的锁 ID。这样，即使两个组织的 runner 容器同时收到 job，也会通过文件锁排队执行，避免硬件冲突。
 

runner.sh

@@ -37,11 +37,12 @@ fi
 RUNNER_GROUP="${RUNNER_GROUP:-Default}"
 RUNNER_WORKDIR="${RUNNER_WORKDIR:-}"
 RUNNER_LABELS="${RUNNER_LABELS:-intel}"
-RUNNER_BOARD="2"
+RUNNER_BOARD="3"
 DISABLE_AUTO_UPDATE="${DISABLE_AUTO_UPDATE:-false}"
 # 板子级：未设置时用本板默认值（同类型板串行、不同类型板并行）；多组织共享同一块板时显式设为相同 ID 即可
 RUNNER_RESOURCE_ID_PHYTIUMPI="${RUNNER_RESOURCE_ID_PHYTIUMPI:-}"
 RUNNER_RESOURCE_ID_ROC_RK3568_PC="${RUNNER_RESOURCE_ID_ROC_RK3568_PC:-}"
+RUNNER_RESOURCE_ID_X86_64_PC="${RUNNER_RESOURCE_ID_X86_64_PC:-}"
 RUNNER_LOCK_DIR="${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}"
 RUNNER_LOCK_HOST_PATH="${RUNNER_LOCK_HOST_PATH:-/tmp/github-runner-locks}"
 # Compose 文件名：未显式设置时自动拼入 ORG/REPO，避免同一主机多组织时文件冲突
@@ -124,6 +125,7 @@ shell_usage() {
   printf "  %-${KEYW}s %s\n" "RUNNER_CUSTOM_IMAGE" "Image tag used for auto-build (can override)"
   printf "  %-${KEYW}s %s\n" "RUNNER_RESOURCE_ID_PHYTIUMPI" "Lock ID for phytiumpi board (default: board-phytiumpi); same ID = serial across runners"
   printf "  %-${KEYW}s %s\n" "RUNNER_RESOURCE_ID_ROC_RK3568_PC" "Lock ID for roc-rk3568-pc board (default: board-roc-rk3568-pc); same ID = serial"
+  printf "  %-${KEYW}s %s\n" "RUNNER_RESOURCE_ID_X86_64_PC" "Lock ID for x86_64-pc board (default: board-x86_64-pc); same ID = serial"
   printf "  %-${KEYW}s %s\n" "RUNNER_LOCK_DIR" "Lock dir in container (default /tmp/github-runner-locks)"
   printf "  %-${KEYW}s %s\n" "RUNNER_LOCK_HOST_PATH" "Lock dir on host for bind mount (default /tmp/github-runner-locks)"
   echo
@@ -492,9 +494,11 @@ shell_generate_compose_file() {
     # 第一步：为两种板子 runner 类型定义资源 ID
     # ════════════════════════════════════════════════════════════════
     # 硬件板 phytiumpi - 总是启用文件锁
-    local res_phytiumpi="${RUNNER_RESOURCE_ID_PHYTIUMPI:-}"
+    local res_phytiumpi="${RUNNER_RESOURCE_ID_PHYTIUMPI:-board-phytiumpi}"
     # 硬件板 roc - 总是启用文件锁
-    local res_roc="${RUNNER_RESOURCE_ID_ROC_RK3568_PC:-}"
+    local res_roc="${RUNNER_RESOURCE_ID_ROC_RK3568_PC:-board-roc-rk3568-pc}"
+    # 硬件板 x86_64 - 总是启用文件锁
+    local res_x86_64="${RUNNER_RESOURCE_ID_X86_64_PC:-board-x86_64-pc}"
 
     # ════════════════════════════════════════════════════════════════
     # 第二步：两种板子 runner 类型的 entrypoint 配置
@@ -504,9 +508,11 @@ shell_generate_compose_file() {
     # 普通 runner 始终使用 /home/runner/run.sh（不经过 runner-wrapper）
     local runner_entrypoint_phytiumpi="/home/runner/run.sh"
     local runner_entrypoint_roc="/home/runner/run.sh"
+    local runner_entrypoint_x86_64="/home/runner/run.sh"
     # 若设置了资源 ID，则改用 runner-wrapper 来处理文件锁
     [[ -n "$res_phytiumpi" ]] && runner_entrypoint_phytiumpi="/home/runner/runner-wrapper/runner-wrapper.sh"
     [[ -n "$res_roc" ]] && runner_entrypoint_roc="/home/runner/runner-wrapper/runner-wrapper.sh"
+    [[ -n "$res_x86_64" ]] && runner_entrypoint_x86_64="/home/runner/runner-wrapper/runner-wrapper.sh"
 
     # ════════════════════════════════════════════════════════════════
     # 第三步：为两种板子 runner 类型准备额外的环境变量数组
@@ -520,10 +526,12 @@ shell_generate_compose_file() {
     # 原因：两种板子 runner 都可能需要文件锁机制
     local extra_env_phytiumpi=()
     local extra_env_roc=()
+    local extra_env_x86_64=()
     local extra_proxy_env=()
     # 只有设置了相应的资源 ID，才为该类型 runner 添加锁相关环境变量
     [[ -n "$res_phytiumpi" ]] && extra_env_phytiumpi=("      RUNNER_RESOURCE_ID: \"$res_phytiumpi\"" "      RUNNER_SCRIPT: \"/home/runner/run.sh\"" "      RUNNER_LOCK_DIR: \"${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}\"")
     [[ -n "$res_roc" ]] && extra_env_roc=("      RUNNER_RESOURCE_ID: \"$res_roc\"" "      RUNNER_SCRIPT: \"/home/runner/run.sh\"" "      RUNNER_LOCK_DIR: \"${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}\"")
+    [[ -n "$res_x86_64" ]] && extra_env_x86_64=("      RUNNER_RESOURCE_ID: \"$res_x86_64\"" "      RUNNER_SCRIPT: \"/home/runner/run.sh\"" "      RUNNER_LOCK_DIR: \"${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}\"")
     [[ -n "${HTTP_PROXY:-}" ]] && extra_proxy_env+=("    HTTP_PROXY: \"${HTTP_PROXY}\"")
     [[ -n "${HTTPS_PROXY:-}" ]] && extra_proxy_env+=("    HTTPS_PROXY: \"${HTTPS_PROXY}\"")
     [[ -n "${NO_PROXY:-}" ]] && extra_proxy_env+=("    NO_PROXY: \"${NO_PROXY}\"")
@@ -536,9 +544,11 @@ shell_generate_compose_file() {
     # 原因：文件锁机制需要在主机和容器间共享锁文件
     local extra_vol_phytiumpi=""
     local extra_vol_roc=""
+    local extra_vol_x86_64=""
     # 只有设置了相应的资源 ID，才为该类型 runner 挂载锁文件目录
     [[ -n "$res_phytiumpi" ]] && extra_vol_phytiumpi="      - ${RUNNER_LOCK_HOST_PATH:-/tmp/github-runner-locks}:${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}"
     [[ -n "$res_roc" ]] && extra_vol_roc="      - ${RUNNER_LOCK_HOST_PATH:-/tmp/github-runner-locks}:${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}"
+    [[ -n "$res_x86_64" ]] && extra_vol_x86_64="      - ${RUNNER_LOCK_HOST_PATH:-/tmp/github-runner-locks}:${RUNNER_LOCK_DIR:-/tmp/github-runner-locks}"
 
     # 使用 printf 输出文件头
     printf '%s\n' \
@@ -703,6 +713,43 @@ shell_generate_compose_file() {
             "      - ${RUNNER_NAME_PREFIX}runner-roc-rk3568-pc-data:/home/runner" \
             "      - ${RUNNER_NAME_PREFIX}runner-roc-rk3568-pc-udev-rules:/etc/udev/rules.d" \
             "" >> "${COMPOSE_FILE}"
+
+        # x86_64 板子配置
+        printf '%s\n' \
+            "  ${RUNNER_NAME_PREFIX}runner-x86_64-pc:" \
+            "    <<: *runner_base" \
+            "    container_name: \"${RUNNER_NAME_PREFIX}runner-x86_64-pc\"" \
+            "    command: [\"${runner_entrypoint_x86_64}\"]" \
+            "    devices:" \
+            "      - /dev/loop-control:/dev/loop-control" \
+            "      - /dev/loop0:/dev/loop0" \
+            "      - /dev/loop1:/dev/loop1" \
+            "      - /dev/loop2:/dev/loop2" \
+            "      - /dev/loop3:/dev/loop3" \
+            "      - /dev/kvm:/dev/kvm" \
+            "      - /dev/ttyUSB4:/dev/ttyUSB4" \
+            "      - /dev/ttyUSB5:/dev/ttyUSB5" \
+            "    group_add:" \
+            "      - 993" \
+            "      - dialout" \
+            "    environment:" \
+            "      <<: *runner_env" \
+            "      RUNNER_NAME: \"${RUNNER_NAME_PREFIX}runner-x86_64-pc\"" \
+            "      RUNNER_LABELS: \"x86_64-pc\"" \
+            "      BOARD_POWER_ON: \"mbpoll -m rtu -a 1 -r 1 -t 0 -b 38400 -P none -v /dev/ttyUSB4 1\"" \
+            "      BOARD_POWER_OFF: \"mbpoll -m rtu -a 1 -r 1 -t 0 -b 38400 -P none -v /dev/ttyUSB4 0\"" \
+            "      BOARD_POWER_RESET: \"mbpoll -m rtu -a 1 -r 1 -t 0 -b 38400 -P none -v /dev/ttyUSB4 0 && sleep 2 && mbpoll -m rtu -a 1 -r 1 -t 0 -b 38400 -P none -v /dev/ttyUSB4 1\"" \
+            "      BOARD_COMM_UART_DEV: \"/dev/ttyUSB5\"" \
+            "      BOARD_COMM_UART_BAUD: \"115200\"" \
+            "      BIN_DIR: \"/home/runner/test/x86_64-pc\"" \
+            "${extra_env_x86_64[@]}" \
+            "    volumes:" \
+            "      - /home/$(whoami)/test/x86_64-pc:/home/runner/tftp" \
+            "$extra_vol_x86_64" \
+            "      - ./runner-wrapper:/home/runner/runner-wrapper:ro" \
+            "      - ${RUNNER_NAME_PREFIX}runner-x86_64-pc-data:/home/runner" \
+            "      - ${RUNNER_NAME_PREFIX}runner-x86_64-pc-udev-rules:/etc/udev/rules.d" \
+            "" >> "${COMPOSE_FILE}"
     fi
 
     # 生成 volumes
@@ -731,6 +778,13 @@ shell_generate_compose_file() {
             "    name: ${RUNNER_NAME_PREFIX}runner-roc-rk3568-pc-data" \
             "  ${RUNNER_NAME_PREFIX}runner-roc-rk3568-pc-udev-rules:" \
             "    name: ${RUNNER_NAME_PREFIX}runner-roc-rk3568-pc-udev-rules" >> "${COMPOSE_FILE}"
+
+        # 为 x86_64 板子生成 volumes
+        printf '%s\n' \
+            "  ${RUNNER_NAME_PREFIX}runner-x86_64-pc-data:" \
+            "    name: ${RUNNER_NAME_PREFIX}runner-x86_64-pc-data" \
+            "  ${RUNNER_NAME_PREFIX}runner-x86_64-pc-udev-rules:" \
+            "    name: ${RUNNER_NAME_PREFIX}runner-x86_64-pc-udev-rules" >> "${COMPOSE_FILE}"
     fi
 }
 

verify-changes.sh

@@ -7,14 +7,15 @@ cd "$(dirname "$0")"
 
 echo "========== 1. 验证板子锁 ID（不回退到 RUNNER_RESOURCE_ID）=========="
 export RUNNER_RESOURCE_ID=global-should-not-be-used
-unset RUNNER_RESOURCE_ID_PHYTIUMPI RUNNER_RESOURCE_ID_ROC_RK3568_PC
+unset RUNNER_RESOURCE_ID_PHYTIUMPI RUNNER_RESOURCE_ID_ROC_RK3568_PC RUNNER_RESOURCE_ID_X86_64
 # 加载 .env 会覆盖，所以这里直接按 runner.sh 逻辑算板子默认
 res_phytiumpi="${RUNNER_RESOURCE_ID_PHYTIUMPI:-board-phytiumpi}"
 res_roc="${RUNNER_RESOURCE_ID_ROC_RK3568_PC:-board-roc-rk3568-pc}"
-if [[ "$res_phytiumpi" == "board-phytiumpi" && "$res_roc" == "board-roc-rk3568-pc" ]]; then
+res_x86_64="${RUNNER_RESOURCE_ID_X86_64_PC:-board-x86_64-pc}"
+if [[ "$res_phytiumpi" == "board-phytiumpi" && "$res_roc" == "board-roc-rk3568-pc" && "$res_x86_64" == "board-x86_64-pc" ]]; then
   echo "  [OK] 未设板子变量时使用 per-board 默认，未使用 global RUNNER_RESOURCE_ID"
 else
-  echo "  [FAIL] res_phytiumpi=$res_phytiumpi res_roc=$res_roc"
+  echo "  [FAIL] res_phytiumpi=$res_phytiumpi res_roc=$res_roc res_x86_64=$res_x86_64"
   exit 1
 fi