Merge pull request #1938 from vyos/yuriy/cleanup-rolling-references

ci/docs: drop current branch references after rename to rolling

8 files changed, 42 insertions, 21 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2c1dd640..61a1c45e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -19,4 +19,4 @@
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/current/CONTRIBUTING.md) document
\ No newline at end of file
+- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-documentation/blob/rolling/CONTRIBUTING.md) document
\ No newline at end of file
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/lint-doc.yml b/.github/workflows/lint-doc.yml
index b5ba4688..d7f25f38 100644
--- a/.github/workflows/lint-doc.yml
+++ b/.github/workflows/lint-doc.yml
@@ -2,9 +2,33 @@ name: Lint Doc
 on:
   pull_request:
 
+permissions:
+  contents: read
+  pull-requests: read
+
 jobs:
-  lint-doc:
-    uses: vyos/.github/.github/workflows/lint-doc.yml@current
-    secrets: inherit
-    
-    
+  doc-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Bullfrog Secure Runner
+        continue-on-error: true
+        uses: bullfrogsec/bullfrog@v0.8.4
+        with:
+          egress-policy: audit
+
+      - name: Get File Changes
+        id: file_changes
+        uses: trilom/file-changes-action@v1.2.4
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.x'
+
+      - name: run doc linter
+        env:
+          FILES_MODIFIED: ${{ steps.file_changes.outputs.files_modified }}
+        run: python scripts/doc-linter.py "$FILES_MODIFIED"
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..16ba1ab5 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 ;;