8 files changed, 69 insertions, 54 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml
new file mode 100644
index 000000000..52b11938e
--- /dev/null
+++ b/.github/workflows/check-open-prs-conflict.yml
@@ -0,0 +1,17 @@
+name: "Open PRs Conflicts checker"
+on:
+  push:
+    branches:
+      - current
+      - sagitta
+      - circinus
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  check-pr-conflict-call:
+    uses: vyos/.github/.github/workflows/check-open-prs-conflict.yml@current
+    secrets: inherit
diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml
new file mode 100644
index 000000000..3c1aeee67
--- /dev/null
+++ b/.github/workflows/cla-check.yml
@@ -0,0 +1,19 @@
+name: "CLA Check"
+
+permissions:
+  actions: write
+  contents: read
+  pull-requests: write
+  statuses: write
+
+on:
+  pull_request:
+    types: [opened, synchronize, closed]
+  issue_comment:
+    types: [created]
+
+jobs:
+  call-cla-assistant:
+    uses: vyos/vyos-cla-signatures/.github/workflows/cla-reusable.yml@current
+    secrets:
+      CLA_PAT: ${{ secrets.CLA_PAT }}
diff --git a/.github/workflows/cleanup-mirror-pr-branch.yml b/.github/workflows/cleanup-mirror-pr-branch.yml
deleted file mode 100644
index a62e44b24..000000000
--- a/.github/workflows/cleanup-mirror-pr-branch.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Cleanup pr mirror branch
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-        - current
-
-permissions:
-  contents: write
-
-jobs:
-  call-delete-branch:
-    if: github.repository_owner != 'vyos'
-    uses: vyos/.github/.github/workflows/cleanup-mirror-pr-branch.yml@current
-    secrets: inherit
diff --git a/.github/workflows/lint-with-ruff.yml b/.github/workflows/darker-ruff-lint.yml
index 00cc9ca1b..0307d14d4 100644
--- a/.github/workflows/lint-with-ruff.yml
+++ b/.github/workflows/darker-ruff-lint.yml
@@ -1,4 +1,4 @@
-name: Lint py code with ruff
+name: Python Lint (Darker + Ruff)
 on:
   pull_request_target:
     branches:
@@ -9,6 +9,6 @@ permissions:
   contents: read
 
 jobs:
-  ruff-lint:
-    uses: vyos/.github/.github/workflows/lint-with-ruff.yml@current
+  darker-ruff-lint:
+    uses: vyos/.github/.github/workflows/lint-with-darker-ruff.yml@current
     secrets: inherit
diff --git a/.github/workflows/mirror-pr-and-sync.yml b/.github/workflows/mirror-pr-and-sync.yml
deleted file mode 100644
index 120e116d4..000000000
--- a/.github/workflows/mirror-pr-and-sync.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: Create Mirror PR and Repo Sync
-on:
-  workflow_dispatch:
-    inputs:
-      sync_branch:
-        description: 'branch to sync'
-        required: true
-        type: string
-
-permissions:
-  pull-requests: write
-  contents: write
-
-jobs:
-  call-mirror-pr-and-sync:
-    if: github.repository_owner != 'vyos'
-    uses: VyOS-Networks/vyos-reusable-workflows/.github/workflows/mirror-pr-and-sync.yml@main
-    with:
-      sync_branch: ${{ inputs.sync_branch }}
-    secrets:
-      PAT: ${{ secrets.PAT }}
diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml
index 2c90fed39..8bdcc598d 100644
--- a/.github/workflows/package-smoketest.yml
+++ b/.github/workflows/package-smoketest.yml
@@ -42,13 +42,14 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
+          submodules: true
       - name: Build vyos-1x package
         run: |
           cd packages/vyos-1x; dpkg-buildpackage -uc -us -tc -b
       - name: Generate ISO version string
         id: version
         run: |
-          echo "build_version=1.5-integration-$(date -u +%Y%m%d%H%M)" >> $GITHUB_OUTPUT
+          echo "build_version=$(date -u +%Y.%m.%d-%H%M-integration)" >> $GITHUB_OUTPUT
       - name: Build custom ISO image
         shell: bash
         run: |
diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml
new file mode 100644
index 000000000..7f0012d18
--- /dev/null
+++ b/.github/workflows/pr-mirror-repo-sync.yml
@@ -0,0 +1,28 @@
+name: PR Mirror and Repo Sync
+on:
+  pull_request_target:
+      types:
+        - closed
+      branches:
+        - current
+  workflow_dispatch:
+    inputs:
+      sync_branch:
+        description: 'branch to sync'
+        required: false
+        type: string
+        default: 'current'
+permissions:
+  pull-requests: write
+  contents: write
+  issues: write
+jobs:
+  call-trigger-mirror-pr-repo-sync:
+    if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true
+    uses: vyos/.github/.github/workflows/pr-mirror-repo-sync.yml@current
+    with:
+      sync_branch: ${{ inputs.sync_branch }}
+    secrets:
+      PAT: ${{ secrets.PAT }}
+      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
+      REMOTE_REPO: ${{ secrets.REMOTE_REPO }}
diff --git a/.github/workflows/trigger-pr-mirror-repo-sync.yml b/.github/workflows/trigger-pr-mirror-repo-sync.yml
deleted file mode 100644
index f74895987..000000000
--- a/.github/workflows/trigger-pr-mirror-repo-sync.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Trigger Mirror PR and Repo Sync
-on:
-  pull_request_target:
-      types:
-        - closed
-      branches:
-        - current
-
-jobs:
-  call-trigger-mirror-pr-repo-sync:
-    if: github.repository_owner == 'vyos' && github.event.pull_request.merged == true
-    uses: vyos/.github/.github/workflows/trigger-pr-mirror-repo-sync.yml@current
-    secrets: inherit