9 Commits
Author SHA1 Message Date
7iwind badb4ebf61 v1.1.0:Merge pull request 'develop' (#26) from develop into main
CI / host (push) Successful in 5s
CI / cortex-m (push) Successful in 6s
Release / release (push) Failing after 6s
v1.1.0:Reviewed-on: #26
2026-07-26 23:47:02 +08:00
7iwind 8c670003b8 Merge pull request 'v1.1.0' (#24) from develop into main
CI / host (push) Successful in 20s
CI / cortex-m (push) Successful in 6s
Release / release (push) Failing after 9s
v1.0.0:Reviewed-on: #24
2026-07-26 23:42:21 +08:00
7iwind b3578b0b53 Merge pull request 'develop' (#20) from develop into main
Release / release (push) Successful in 10s
Reviewed-on: #20
2026-07-26 22:41:12 +08:00
7iwind 714281dbf1 Merge pull request 'develop' (#18) from develop into main
Release / release (push) Successful in 8s
Reviewed-on: #18
2026-07-26 15:07:38 +08:00
7iwind f6684bebc9 Merge pull request 'develop' (#16) from develop into main
Release / release (push) Failing after 18s
Reviewed-on: #16
2026-07-26 14:54:14 +08:00
7iwind 323b6bd464 Merge pull request 'fix: 优化打包后的目录结构,便于引入' (#14) from feature/route into main
Release / release (push) Failing after 20s
Reviewed-on: #14
2026-07-26 14:45:05 +08:00
7iwind 29c49057b4 Merge pull request 'develop' (#12) from develop into main
Release / release (push) Successful in 19s
Reviewed-on: #12
2026-07-26 13:30:36 +08:00
7iwind 0e0047b946 Merge pull request 'Merge pull request 'feature/route' (#9) from feature/route into develop' (#10) from develop into main
Release / build (map[build_testing:OFF cmake_extra: name:linux-arm64 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-arm64.cmake]) (push) Failing after 8s
Release / build (map[build_testing:OFF cmake_extra: name:linux-armhf toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-armhf.cmake]) (push) Failing after 7s
Release / build (map[build_testing:OFF cmake_extra:-DBUILD_EXAMPLES=OFF -DBUILD_SHARED=OFF name:baremetal-arm32 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-baremetal-arm32.cmake]) (push) Failing after 6s
Release / build (map[build_testing:OFF cmake_extra:-DBUILD_EXAMPLES=OFF name:windows-amd64 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-windows-amd64.cmake]) (push) Failing after 7s
Release / build (map[build_testing:ON cmake_extra: name:linux-amd64 toolchain:]) (push) Failing after 6s
Release / release (push) Has been skipped
Reviewed-on: #10
2026-07-26 13:26:14 +08:00
7iwind 18bc4eb08f Merge pull request 'fix: 修复 bash -e 下,for 循环中 [ -f ... ] && cp ... 里 [ 返回 1 时会触发 set -e 退出脚本。同时 test 需要实际开启 BUILD_TESTING。' (#8) from feature/route into main
Release / build (map[build_testing:OFF cmake_extra: name:linux-arm64 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-arm64.cmake]) (push) Failing after 7s
Release / build (map[build_testing:OFF cmake_extra: name:linux-armhf toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-armhf.cmake]) (push) Failing after 6s
Release / build (map[build_testing:OFF cmake_extra:-DBUILD_EXAMPLES=OFF -DBUILD_SHARED=OFF name:baremetal-arm32 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-baremetal-arm32.cmake]) (push) Failing after 6s
Release / build (map[build_testing:OFF cmake_extra:-DBUILD_EXAMPLES=OFF name:windows-amd64 toolchain:-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-windows-amd64.cmake]) (push) Failing after 7s
Release / build (map[build_testing:ON cmake_extra: name:linux-amd64 toolchain:]) (push) Failing after 6s
Release / release (push) Has been skipped
Reviewed-on: #8
2026-07-26 13:23:55 +08:00
+9 -13
View File
@@ -15,6 +15,8 @@ jobs:
- name: Auto-tag from merged PR - name: Auto-tag from merged PR
id: autotag id: autotag
run: | run: |
set -e
# 已有标签 → 跳过 # 已有标签 → 跳过
EXISTING=$(git tag --points-at HEAD | grep '^v' | head -n1) EXISTING=$(git tag --points-at HEAD | grep '^v' | head -n1)
if [ -n "$EXISTING" ]; then if [ -n "$EXISTING" ]; then
@@ -23,7 +25,7 @@ jobs:
exit 0 exit 0
fi fi
# 非 merge commit → 跳过 # 非 merge commit → 跳过(直接 push 不处理)
PARENTS=$(git log --format="%P" -1 | wc -w) PARENTS=$(git log --format="%P" -1 | wc -w)
if [ "$PARENTS" -lt 2 ]; then if [ "$PARENTS" -lt 2 ]; then
echo "Not a merge commit, skip auto-tag" echo "Not a merge commit, skip auto-tag"
@@ -32,7 +34,7 @@ jobs:
# 从 merge commit message 提取 PR 号 # 从 merge commit message 提取 PR 号
COMMIT_MSG=$(git log --format="%B" -1) COMMIT_MSG=$(git log --format="%B" -1)
PR_NUM=$(echo "$COMMIT_MSG" | grep -oP '#\K\d+' | head -1) || true PR_NUM=$(echo "$COMMIT_MSG" | grep -oP '#\K\d+' | head -1)
if [ -z "$PR_NUM" ]; then if [ -z "$PR_NUM" ]; then
echo "No PR number found in merge message" echo "No PR number found in merge message"
exit 0 exit 0
@@ -53,22 +55,16 @@ jobs:
VERSION="$PR_BODY" VERSION="$PR_BODY"
echo "Found version: $VERSION" echo "Found version: $VERSION"
# 检查远端是否已有此标签 # 创建本地标签
if git ls-remote --tags origin "$VERSION" 2>/dev/null | grep -q .; then
echo "Tag $VERSION already exists on remote, skipping push"
git tag "$VERSION" 2>/dev/null || true
echo "tag=$VERSION" >> "$GITHUB_OUTPUT"
exit 0
fi
# 创建并推送标签
git config user.email "ci@datarouter" git config user.email "ci@datarouter"
git config user.name "DataRouter CI" git config user.name "DataRouter CI"
git tag -a "$VERSION" -m "Release $VERSION" git tag -a "$VERSION" -m "Release $VERSION"
echo "Created local tag: $VERSION" echo "Created local tag: $VERSION"
# 使用 origin remote(actions/checkout 已配置好认证) # 推送到远端(不会触发本 workflow — 仅匹配 branches: [main])
git push origin "$VERSION" 2>&1 ORIGIN=$(git config --get remote.origin.url)
PUSH_URL="https://oauth2:${TOKEN}@${ORIGIN#https://}"
git push "$PUSH_URL" "$VERSION"
echo "Pushed tag: $VERSION" echo "Pushed tag: $VERSION"
echo "tag=$VERSION" >> "$GITHUB_OUTPUT" echo "tag=$VERSION" >> "$GITHUB_OUTPUT"