diff options
author | Daniil Baturin <daniil@vyos.io> | 2024-07-02 16:16:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-02 16:16:24 +0200 |
commit | 64aee19ad237a2f0b051d1cdecdbb8150e2cc74b (patch) | |
tree | cc40e77648499a4404e36a447b97adfe9abb2b22 | |
parent | 4ae741516480d3319a37549f12a3067409e1976c (diff) | |
parent | 53569a889d2caa5a1fa92a7328f4940038d53d43 (diff) | |
download | vyos-build-64aee19ad237a2f0b051d1cdecdbb8150e2cc74b.tar.gz vyos-build-64aee19ad237a2f0b051d1cdecdbb8150e2cc74b.zip |
Merge pull request #669 from vyos/mergify/bp/equuleus/pr-668equuleus
T6508: pr workflows updated for branch and target (backport #668)
-rw-r--r-- | .github/workflows/add-pr-labels.yml | 4 | ||||
-rw-r--r-- | .github/workflows/auto-author-assign.yml | 3 | ||||
-rw-r--r-- | .github/workflows/chceck-pr-message.yml | 6 | ||||
-rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 2 | ||||
-rw-r--r-- | .github/workflows/check-stale.yml | 2 | ||||
-rw-r--r-- | .github/workflows/check-unused-imports.yml | 4 | ||||
-rw-r--r-- | .github/workflows/codeql.yml | 8 | ||||
-rw-r--r-- | .github/workflows/label-backport.yml | 2 | ||||
-rw-r--r-- | .github/workflows/linit-j2.yml | 19 |
9 files changed, 13 insertions, 37 deletions
diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml index ffb04f33..bf19d474 100644 --- a/.github/workflows/add-pr-labels.yml +++ b/.github/workflows/add-pr-labels.yml @@ -4,9 +4,7 @@ name: Add pull request labels on: pull_request_target: branches: - - current - equuleus - - sagitta permissions: pull-requests: write @@ -14,5 +12,5 @@ permissions: 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@equuleus secrets: inherit diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml index c3696ea4..d540cabd 100644 --- a/.github/workflows/auto-author-assign.yml +++ b/.github/workflows/auto-author-assign.yml @@ -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@equuleus secrets: inherit diff --git a/.github/workflows/chceck-pr-message.yml b/.github/workflows/chceck-pr-message.yml index f4d30b28..f6b33f2f 100644 --- a/.github/workflows/chceck-pr-message.yml +++ b/.github/workflows/chceck-pr-message.yml @@ -2,10 +2,8 @@ name: Check pull request message format on: - pull_request: + pull_request_target: branches: - - current - - sagitta - equuleus permissions: @@ -14,5 +12,5 @@ permissions: 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@equuleus secrets: inherit diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml index 0c659e6e..d5186e71 100644 --- a/.github/workflows/check-pr-conflicts.yml +++ b/.github/workflows/check-pr-conflicts.yml @@ -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@equuleus secrets: inherit diff --git a/.github/workflows/check-stale.yml b/.github/workflows/check-stale.yml index 59d25a11..7bedf910 100644 --- a/.github/workflows/check-stale.yml +++ b/.github/workflows/check-stale.yml @@ -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@equuleus secrets: inherit diff --git a/.github/workflows/check-unused-imports.yml b/.github/workflows/check-unused-imports.yml index 324a63e9..e5e49e20 100644 --- a/.github/workflows/check-unused-imports.yml +++ b/.github/workflows/check-unused-imports.yml @@ -2,8 +2,6 @@ name: Check for unused imports using Pylint on: pull_request: branches: - - current - - sagitta - equuleus workflow_dispatch: @@ -12,5 +10,5 @@ permissions: 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@equuleus secrets: inherit diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a4fc39e2..92a2dc65 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,10 +2,12 @@ name: "Perform CodeQL Analysis" on: push: - branches: [ "current", "sagitta", "equuleus" ] + branches: + - equuleus pull_request: # The branches below must be a subset of the branches above - branches: [ "current" ] + branches: + - equuleus schedule: - cron: '22 10 * * 0' workflow_dispatch: @@ -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@equuleus secrets: inherit with: languages: "['python']" diff --git a/.github/workflows/label-backport.yml b/.github/workflows/label-backport.yml index 9192b818..1ea862f8 100644 --- a/.github/workflows/label-backport.yml +++ b/.github/workflows/label-backport.yml @@ -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@equuleus secrets: inherit diff --git a/.github/workflows/linit-j2.yml b/.github/workflows/linit-j2.yml deleted file mode 100644 index 95bfa61f..00000000 --- a/.github/workflows/linit-j2.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -name: J2 Lint - -on: - pull_request: - branches: - - current - - sagitta - - equuleus - workflow_dispatch: - -permissions: - pull-requests: write - contents: read - -jobs: - j2lint: - uses: vyos/.github/.github/workflows/lint-j2.yml@feature/T6349-reusable-workflows - secrets: inherit |