diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ai-validation.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/pr-mirror-repo-sync.yml | 11 | ||||
| -rw-r--r-- | .github/workflows/submodules.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/update-translations.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-version-tags.yml | 3 |
6 files changed, 12 insertions, 15 deletions
diff --git a/.github/workflows/ai-validation.yml b/.github/workflows/ai-validation.yml index a5d120e7..60964396 100644 --- a/.github/workflows/ai-validation.yml +++ b/.github/workflows/ai-validation.yml @@ -150,7 +150,7 @@ jobs: IMPORTANT: This PR targets the **${{ steps.branch.outputs.target }}** branch. The vyos-1x checkout matches this branch. Features may differ between branches - (e.g., a command exists in `current` but not in `sagitta`). Only flag issues + (e.g., a command exists in `rolling` but not in `sagitta`). Only flag issues relevant to this specific branch. ## Pass 1 Findings diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml index 3aa9ce05..9667fd62 100644 --- a/.github/workflows/check-open-prs-conflict.yml +++ b/.github/workflows/check-open-prs-conflict.yml @@ -2,7 +2,6 @@ name: "Open PRs Conflicts checker" on: push: branches: - - current - rolling - sagitta - circinus diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml index 1f01bd02..5c944971 100644 --- a/.github/workflows/pr-mirror-repo-sync.yml +++ b/.github/workflows/pr-mirror-repo-sync.yml @@ -3,16 +3,15 @@ name: PR Mirror and Repo Sync on:
pull_request_target:
types: [closed]
- branches: [current, rolling]
+ branches: [rolling]
workflow_dispatch:
inputs:
sync_branch:
description: 'Branch to mirror'
required: true
- default: 'current'
+ default: 'rolling'
type: choice
options:
- - current
- rolling
permissions:
@@ -28,9 +27,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_name == 'pull_request_target' && github.event.pull_request.base.ref || 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 || 'rolling' }}
secrets:
PAT: ${{ secrets.PAT }}
REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
diff --git a/.github/workflows/submodules.yml b/.github/workflows/submodules.yml index 24b6c505..bb93b93f 100644 --- a/.github/workflows/submodules.yml +++ b/.github/workflows/submodules.yml @@ -5,7 +5,7 @@ on: # 06:00 UTC on Monday - cron: '0 6 * * 1' jobs: - update_current: + update_rolling: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -31,12 +31,12 @@ jobs: uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.PR_ACTION_DOCUMENTATION_SUBMODULE_UPDATE }} - commit-message: "Github: update current branch" - title: "Github: update current branch" + commit-message: "Github: update rolling branch" + title: "Github: update rolling branch" body: | Autoupdate vyos-1x submodule update releasenotes - branch: update-dependencies-current + branch: update-dependencies-rolling delete-branch: true update_sagitta: diff --git a/.github/workflows/update-translations.yml b/.github/workflows/update-translations.yml index 6ab53323..4b0bafa1 100644 --- a/.github/workflows/update-translations.yml +++ b/.github/workflows/update-translations.yml @@ -57,6 +57,6 @@ jobs: title: "Github: update translations" body: | Generate, upload new and download translation files - branch: update-translations-current + branch: update-translations-rolling delete-branch: true diff --git a/.github/workflows/update-version-tags.yml b/.github/workflows/update-version-tags.yml index c7c372a3..7f179586 100644 --- a/.github/workflows/update-version-tags.yml +++ b/.github/workflows/update-version-tags.yml @@ -3,7 +3,6 @@ name: Update version tags on: push: branches: - - current - rolling - circinus - sagitta @@ -28,7 +27,7 @@ jobs: run: | set -euo pipefail case "$BRANCH" in - current|rolling) TAG=rolling ;; + rolling) TAG=rolling ;; circinus) TAG=1.5 ;; sagitta) TAG=1.4 ;; *) echo "Unexpected branch: $BRANCH" >&2; exit 1 ;; |