3d2eb97205
CI / lint (push) Successful in 1m4s
CI / sanitizers (address) (push) Successful in 36s
CI / sanitizers (undefined) (push) Successful in 36s
CI / fuzz-build (push) Successful in 14s
CI / coverage (push) Successful in 31s
CI / build-and-test (push) Successful in 1m15s
CI / valgrind (push) Successful in 32s
39 lines
1.0 KiB
YAML
39 lines
1.0 KiB
YAML
name: Agent Batch Merge
|
|
on:
|
|
workflow_dispatch:
|
|
inputs:
|
|
branches:
|
|
description: "Comma-separated branches to merge (e.g., fix/a,fix/b)"
|
|
required: true
|
|
|
|
jobs:
|
|
batch-merge:
|
|
runs-on: ubuntu-latest
|
|
container: gitea.tap-tap.win/taptap/fastsync-ci:v9
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
with:
|
|
ref: dev
|
|
fetch-depth: 0
|
|
|
|
- name: Merge all branches
|
|
run: |
|
|
IFS=',' read -ra BRANCHES <<< "${{ github.event.inputs.branches }}"
|
|
for branch in "${BRANCHES[@]}"; do
|
|
branch=$(echo "$branch" | xargs)
|
|
git fetch origin "$branch"
|
|
git merge "origin/$branch" --no-edit || true
|
|
done
|
|
|
|
- name: Build and test
|
|
run: |
|
|
cmake -B build -S . && cmake --build build -j$(nproc)
|
|
./build/tests
|
|
python3 -m pytest tests/ -v --tb=short
|
|
|
|
- name: Commit and push
|
|
run: |
|
|
git add -A
|
|
git commit -m "batch-merge: ${{ github.event.inputs.branches }}" || true
|
|
git push origin dev
|