Skip to content

Commit

Permalink
Merge pull request #670 from vyos/mergify/bp/circinus/pr-668
Browse files Browse the repository at this point in the history
T6508: pr workflows updated for branch and target (backport #668)
  • Loading branch information
c-po authored Jun 26, 2024
2 parents e642c46 + cede3f2 commit 091d200
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 42 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/add-pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ name: Add pull request labels
on:
pull_request_target:
branches:
- current
- equuleus
- sagitta
- circinus

permissions:
pull-requests: write
contents: read

jobs:
add-pr-label:
uses: vyos/.github/.github/workflows/add-pr-labels.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/add-pr-labels.yml@circinus
secrets: inherit
3 changes: 1 addition & 2 deletions .github/workflows/auto-author-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ on:
pull_request_target:
types: [opened, reopened, ready_for_review, locked]


permissions:
pull-requests: write
contents: read

jobs:
assign-author:
uses: vyos/.github/.github/workflows/assign-author.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/assign-author.yml@circinus
secrets: inherit
8 changes: 3 additions & 5 deletions .github/workflows/chceck-pr-message.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
name: Check pull request message format

on:
pull_request:
pull_request_target:
branches:
- current
- sagitta
- equuleus
- circinus

permissions:
pull-requests: write
contents: read

jobs:
check-pr-title:
uses: vyos/.github/.github/workflows/check-pr-message.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/check-pr-message.yml@circinus
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ permissions:

jobs:
check-pr-conflict-call:
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@circinus
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/check-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ permissions:

jobs:
stale:
uses: vyos/.github/.github/workflows/check-stale.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/check-stale.yml@circinus
secrets: inherit
6 changes: 2 additions & 4 deletions .github/workflows/check-unused-imports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ name: Check for unused imports using Pylint
on:
pull_request:
branches:
- current
- sagitta
- equuleus
- circinus
workflow_dispatch:

permissions:
contents: read

jobs:
check-unused-imports:
uses: vyos/.github/.github/workflows/check-unused-imports.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/check-unused-imports.yml@circinus
secrets: inherit
8 changes: 5 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ name: "Perform CodeQL Analysis"

on:
push:
branches: [ "current", "sagitta", "equuleus" ]
branches:
- circinus
pull_request:
# The branches below must be a subset of the branches above
branches: [ "current" ]
branches:
- circinus
schedule:
- cron: '22 10 * * 0'
workflow_dispatch:
Expand All @@ -17,7 +19,7 @@ permissions:

jobs:
codeql-analysis-call:
uses: vyos/.github/.github/workflows/codeql-analysis.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/codeql-analysis.yml@circinus
secrets: inherit
with:
languages: "['python']"
2 changes: 1 addition & 1 deletion .github/workflows/label-backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ permissions:

jobs:
mergifyio-backport:
uses: vyos/.github/.github/workflows/label-backport.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/label-backport.yml@circinus
secrets: inherit
19 changes: 0 additions & 19 deletions .github/workflows/linit-j2.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/repo-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
types:
- closed
branches:
- current
- circinus
workflow_dispatch:

jobs:
trigger-sync:
uses: vyos/.github/.github/workflows/trigger-repo-sync.yml@feature/T6349-reusable-workflows
uses: vyos/.github/.github/workflows/trigger-repo-sync.yml@circinus
secrets:
REMOTE_REPO: ${{ secrets.REMOTE_REPO }}
REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }}
Expand Down

0 comments on commit 091d200

Please sign in to comment.