From 36037b9f138a135aa7645a774a5412042da73f1d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 10 May 2026 12:00:24 +0000 Subject: ci: derive sync branch by PR base and add rolling tag trigger Agent-Logs-Url: https://github.com/vyos/vyos-documentation/sessions/13538647-bbfb-438c-bec8-30f9ee0aa923 Co-authored-by: andamasov <12631358+andamasov@users.noreply.github.com> --- .github/workflows/pr-mirror-repo-sync.yml | 6 +++--- .github/workflows/update-version-tags.yml | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml index cc79a0c5..1f01bd02 100644 --- a/.github/workflows/pr-mirror-repo-sync.yml +++ b/.github/workflows/pr-mirror-repo-sync.yml @@ -28,9 +28,9 @@ jobs: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true) ) - uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current - with: - sync_branch: ${{ github.event.inputs.sync_branch || 'current' }} + uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current + with: + sync_branch: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.base.ref || github.event.inputs.sync_branch || 'current' }} secrets: PAT: ${{ secrets.PAT }} REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }} diff --git a/.github/workflows/update-version-tags.yml b/.github/workflows/update-version-tags.yml index eb87f801..c7c372a3 100644 --- a/.github/workflows/update-version-tags.yml +++ b/.github/workflows/update-version-tags.yml @@ -4,6 +4,7 @@ on: push: branches: - current + - rolling - circinus - sagitta @@ -27,7 +28,7 @@ jobs: run: | set -euo pipefail case "$BRANCH" in - current) TAG=rolling ;; + current|rolling) TAG=rolling ;; circinus) TAG=1.5 ;; sagitta) TAG=1.4 ;; *) echo "Unexpected branch: $BRANCH" >&2; exit 1 ;; -- cgit v1.2.3