diff options
| author | Andrii Klymenko <a.klymenko@vyos.io> | 2026-05-08 16:22:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-08 16:22:17 +0300 |
| commit | 560bba0ef00af6039d9b95e31ee822a7f89c0fd7 (patch) | |
| tree | e7fe18da8cc764384b7b7f35f6a8b21d1ddbd915 /.github | |
| parent | a0f74b5a2565956ce405b7185842cbdd0b4f1768 (diff) | |
| parent | 2413b09291341031d77066db5f84509a7def54cd (diff) | |
| download | vyos-build-560bba0ef00af6039d9b95e31ee822a7f89c0fd7.tar.gz vyos-build-560bba0ef00af6039d9b95e31ee822a7f89c0fd7.zip | |
Merge branch 'current' into T8542-SBOM-current
Diffstat (limited to '.github')
| -rw-r--r-- | .github/mergify.yml | 15 | ||||
| -rw-r--r-- | .github/workflows/package-smoketest.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/trigger-docker-image-build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/trigger_rebuild_packages.yml | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml index 8733cfca..b2cf6ace 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -8,3 +8,18 @@ pull_request_rules: label: toggle: - conflicts + +commands_restrictions: + backport: &allowed + conditions: + - or: + - sender=@vyos/maintainers + - sender=vyosbot + copy: *allowed + dequeue: *allowed + queue: *allowed + rebase: *allowed + refresh: *allowed + requeue: *allowed + squash: *allowed + update: *allowed diff --git a/.github/workflows/package-smoketest.yml b/.github/workflows/package-smoketest.yml index 6a909139..56e01d30 100644 --- a/.github/workflows/package-smoketest.yml +++ b/.github/workflows/package-smoketest.yml @@ -103,7 +103,7 @@ jobs: --vyos-mirror ${{ needs.set_config.outputs.vyos_mirror }} \ generic - - uses: actions/upload-artifact@v6 + - uses: actions/upload-artifact@v7 with: retention-days: 2 name: vyos-${{ steps.version.outputs.build_version }} diff --git a/.github/workflows/trigger-docker-image-build.yml b/.github/workflows/trigger-docker-image-build.yml index ebc1bcc8..cc5a2abb 100644 --- a/.github/workflows/trigger-docker-image-build.yml +++ b/.github/workflows/trigger-docker-image-build.yml @@ -26,7 +26,7 @@ jobs: steps:
- name: Checkout vyos/vyos-build repo
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.base.ref }}
diff --git a/.github/workflows/trigger_rebuild_packages.yml b/.github/workflows/trigger_rebuild_packages.yml index f184c1da..ef3e3a34 100644 --- a/.github/workflows/trigger_rebuild_packages.yml +++ b/.github/workflows/trigger_rebuild_packages.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ github.ref_name }} |