From 78e43adfa089d4b10f233069d2995ec45296a833 Mon Sep 17 00:00:00 2001 From: Yuriy Andamasov Date: Sat, 30 May 2026 18:38:42 +0300 Subject: ci: T8943: migrate branch-name refs current->rolling (rollout 1c) (#1204) Tracking: T8943 --- .github/workflows/check-unused-imports.yml | 2 +- .github/workflows/codeql.yml | 4 +- .github/workflows/linit-j2.yml | 2 +- .github/workflows/package-smoketest.yml | 4 +- .github/workflows/pr-mirror-repo-sync.yml | 2 +- .github/workflows/trigger-docker-image-build.yml | 96 ++++++++++++------------ .github/workflows/trigger_rebuild_packages.yml | 2 +- 7 files changed, 56 insertions(+), 56 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml index 336fd999..0c6ae8b1 100644 --- a/.github/workflows/check-unused-imports.yml +++ b/.github/workflows/check-unused-imports.yml @@ -2,7 +2,7 @@ name: Check for unused imports using Pylint on: pull_request: branches: - - current + - rolling - sagitta - equuleus workflow_dispatch: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 47ab5fd5..48729bdf 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -3,7 +3,7 @@ name: "Perform CodeQL Analysis" on: push: branches: - - current + - rolling - circinus - sagitta paths: @@ -13,7 +13,7 @@ on: pull_request: # The branches below must be a subset of the branches above branches: - - current + - rolling - circinus - sagitta paths: diff --git a/.github/workflows/linit-j2.yml b/.github/workflows/linit-j2.yml index 7731ce84..25dc6dc8 100644 --- a/.github/workflows/linit-j2.yml +++ b/.github/workflows/linit-j2.yml @@ -4,7 +4,7 @@ name: J2 Lint on: pull_request: branches: - - current + - rolling - sagitta - equuleus workflow_dispatch: diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml index 56e01d30..0aa3f872 100644 --- a/.github/workflows/package-smoketest.yml +++ b/.github/workflows/package-smoketest.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - current + - rolling - circinus - sagitta paths: @@ -15,7 +15,7 @@ on: - '!docker-vyos/**' pull_request_target: branches: - - current + - rolling - circinus - sagitta paths: diff --git a/.github/workflows/pr-mirror-repo-sync.yml b/.github/workflows/pr-mirror-repo-sync.yml index ce073491..5320e012 100644 --- a/.github/workflows/pr-mirror-repo-sync.yml +++ b/.github/workflows/pr-mirror-repo-sync.yml @@ -6,7 +6,7 @@ name: PR Mirror and Repo Sync on: pull_request_target: types: [closed] - branches: [current] + branches: [rolling] workflow_dispatch: inputs: sync_branch: diff --git a/.github/workflows/trigger-docker-image-build.yml b/.github/workflows/trigger-docker-image-build.yml index cc5a2abb..816c7906 100644 --- a/.github/workflows/trigger-docker-image-build.yml +++ b/.github/workflows/trigger-docker-image-build.yml @@ -1,49 +1,49 @@ -name: Trigger Docker image build - -on: - pull_request_target: - types: - - closed - branches: - - current - - circinus - - sagitta - -permissions: - packages: write - contents: read - attestations: write - id-token: write - pull-requests: read - -jobs: - track-changes: - if: github.event.pull_request.merged == true - runs-on: ubuntu-latest - - env: - REF: main # Used for curl to trigger image build - - steps: - - name: Checkout vyos/vyos-build repo - uses: actions/checkout@v6 - with: - ref: ${{ github.event.pull_request.base.ref }} - - - uses: dorny/paths-filter@v3 - id: changes - with: - filters: | - docker-dir: - - 'docker/**' - - - name: "Trigger Docker image build for ${{ github.event.pull_request.base.ref }}" - if: ${{ steps.changes.outputs.docker-dir == 'true' }} - run: | - curl -L \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.PAT }}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/${{ secrets.REMOTE_OWNER }}/${{ secrets.REMOTE_REUSE_REPO }}/actions/workflows/build-docker-image.yml/dispatches \ +name: Trigger Docker image build + +on: + pull_request_target: + types: + - closed + branches: + - rolling + - circinus + - sagitta + +permissions: + packages: write + contents: read + attestations: write + id-token: write + pull-requests: read + +jobs: + track-changes: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + + env: + REF: main # Used for curl to trigger image build + + steps: + - name: Checkout vyos/vyos-build repo + uses: actions/checkout@v6 + with: + ref: ${{ github.event.pull_request.base.ref }} + + - uses: dorny/paths-filter@v3 + id: changes + with: + filters: | + docker-dir: + - 'docker/**' + + - name: "Trigger Docker image build for ${{ github.event.pull_request.base.ref }}" + if: ${{ steps.changes.outputs.docker-dir == 'true' }} + run: | + curl -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer ${{ secrets.PAT }}" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/${{ secrets.REMOTE_OWNER }}/${{ secrets.REMOTE_REUSE_REPO }}/actions/workflows/build-docker-image.yml/dispatches \ -d '{"ref": "${{ env.REF }}", "inputs":{"branch":"${{ github.event.pull_request.base.ref }}", "environment":"production"}}' \ No newline at end of file diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index ef3e3a34..1a31b6b9 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -3,7 +3,7 @@ name: Trigger to build package on: push: branches: - - current + - rolling jobs: changes: -- cgit v1.2.3