From e40e9e81809c6c49cb012a01c63a3463bfa41f8e Mon Sep 17 00:00:00 2001 From: Vijayakumar Date: Tue, 7 May 2024 14:10:01 +0530 Subject: T6310: updated codeql version T6310: updated codeql version for other calls --- .github/workflows/codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 75f8a1b..7176702 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,7 +41,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{matrix.language}} config-file: ${{inputs.codeql-cfg-path}} @@ -50,7 +50,7 @@ jobs: # If this step fails, configure a build command manually using build-command input. This command will be executed in the corresponding step. - name: Autobuild if: ${{!inputs.build-command}} - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Manual build if: ${{inputs.build-command}} @@ -58,4 +58,4 @@ jobs: ${{inputs.build-command}} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 -- cgit v1.2.3 From d327ae13f5da750e80ebc2497139b7fd94ad6a88 Mon Sep 17 00:00:00 2001 From: Vijayakumar Date: Tue, 7 May 2024 14:32:43 +0530 Subject: T6310: add PR templates --- .github/PULL_REQUEST_TEMPLATE.md | 60 ++++++++++++++++++++++++ .github/labeler.yml | 12 +++++ .github/reviewers.yml | 3 ++ .github/workflows/auto-author-assign.yml | 27 +++++++++++ .github/workflows/mergifyio_backport.yml | 22 +++++++++ .github/workflows/pr-conflicts.yml | 18 +++++++ .github/workflows/pull-request-labels.yml | 20 ++++++++ .github/workflows/pull-request-management.yml | 25 ++++++++++ .github/workflows/pull-request-message-check.yml | 23 +++++++++ .github/workflows/stale.yml | 22 +++++++++ .github/workflows/unused-imports.yml | 22 +++++++++ 11 files changed, 254 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/labeler.yml create mode 100644 .github/reviewers.yml create mode 100644 .github/workflows/auto-author-assign.yml create mode 100644 .github/workflows/mergifyio_backport.yml create mode 100644 .github/workflows/pr-conflicts.yml create mode 100644 .github/workflows/pull-request-labels.yml create mode 100644 .github/workflows/pull-request-management.yml create mode 100644 .github/workflows/pull-request-message-check.yml create mode 100644 .github/workflows/stale.yml create mode 100644 .github/workflows/unused-imports.yml (limited to '.github/workflows') diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..cd348ea --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,60 @@ + + + +## Change Summary + + +## Types of changes + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Code style update (formatting, renaming) +- [ ] Refactoring (no functional changes) +- [ ] Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component +- [ ] Other (please describe): + +## Related Task(s) + + + +## Related PR(s) + + +## Component(s) name + + +## Proposed changes + + +## How to test + + +## Smoketest result + + +## Checklist: + + + +- [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document +- [ ] I have linked this PR to one or more Phabricator Task(s) +- [ ] I have run the components [**SMOKETESTS**](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) if applicable +- [ ] My commit headlines contain a valid Task id +- [ ] My change requires a change to the documentation +- [ ] I have updated the documentation accordingly diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000..e0b9ee4 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,12 @@ +equuleus: + - any: + - base-branch: 'equuleus' +current: + - any: + - base-branch: 'current' +crux: + - any: + - base-branch: 'crux' +sagitta: + - any: + - base-branch: 'sagitta' diff --git a/.github/reviewers.yml b/.github/reviewers.yml new file mode 100644 index 0000000..a1647d2 --- /dev/null +++ b/.github/reviewers.yml @@ -0,0 +1,3 @@ +--- +"**/*": + - team: reviewers diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml new file mode 100644 index 0000000..1a7f8ef --- /dev/null +++ b/.github/workflows/auto-author-assign.yml @@ -0,0 +1,27 @@ +name: "PR Triage" +on: + pull_request_target: + types: [opened, reopened, ready_for_review, locked] + +permissions: + pull-requests: write + +jobs: + # https://github.com/marketplace/actions/auto-author-assign + assign-author: + runs-on: ubuntu-latest + steps: + - name: "Assign Author to PR" + uses: toshimaru/auto-author-assign@v1.6.2 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + + # https://github.com/shufo/auto-assign-reviewer-by-files + assign_reviewer: + runs-on: ubuntu-latest + steps: + - name: Request review based on files changes and/or groups the author belongs to + uses: shufo/auto-assign-reviewer-by-files@v1.1.4 + with: + token: ${{ secrets.PR_ACTION_ASSIGN_REVIEWERS }} + config: .github/reviewers.yml diff --git a/.github/workflows/mergifyio_backport.yml b/.github/workflows/mergifyio_backport.yml new file mode 100644 index 0000000..d9f863d --- /dev/null +++ b/.github/workflows/mergifyio_backport.yml @@ -0,0 +1,22 @@ +name: Mergifyio backport + +on: [issue_comment] + +jobs: + mergifyio_backport: + if: github.repository == 'vyos/vyos-1x' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: actions-ecosystem/action-regex-match@v2 + id: regex-match + with: + text: ${{ github.event.comment.body }} + regex: '@[Mm][Ee][Rr][Gg][Ii][Ff][Yy][Ii][Oo] backport ' + + - uses: actions-ecosystem/action-add-labels@v1 + if: ${{ steps.regex-match.outputs.match != '' }} + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + labels: backport diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml new file mode 100644 index 0000000..2fd0bb4 --- /dev/null +++ b/.github/workflows/pr-conflicts.yml @@ -0,0 +1,18 @@ +name: "PR Conflicts checker" +on: + pull_request_target: + types: [synchronize] + +jobs: + Conflict_Check: + name: 'Check PR status: conflicts and resolution' + runs-on: ubuntu-latest + steps: + - name: check if PRs are dirty + uses: eps1lon/actions-label-merge-conflict@v3 + with: + dirtyLabel: "state: conflict" + removeOnDirtyLabel: "state: conflict resolved" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." + commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml new file mode 100644 index 0000000..43856be --- /dev/null +++ b/.github/workflows/pull-request-labels.yml @@ -0,0 +1,20 @@ +--- +name: Add pull request labels + +on: + pull_request_target: + branches: + - current + - crux + - equuleus + - sagitta + +jobs: + add-pr-label: + name: Add PR Labels + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + steps: + - uses: actions/labeler@v5 diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml new file mode 100644 index 0000000..3a855c1 --- /dev/null +++ b/.github/workflows/pull-request-management.yml @@ -0,0 +1,25 @@ +--- +name: Build Pull Request Package + +on: + pull_request: + branches: + - current + - crux + - equuleus + +jobs: + j2lint: + name: Validate j2 files + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + timeout-minutes: 2 + - name: Setup J2Lint + timeout-minutes: 2 + run: | + sudo pip install git+https://github.com/aristanetworks/j2lint.git@341b5d5db86e095b622f09770cb6367a1583620e + - name: Run J2lint + timeout-minutes: 2 + run: | + j2lint $GITHUB_WORKSPACE/data diff --git a/.github/workflows/pull-request-message-check.yml b/.github/workflows/pull-request-message-check.yml new file mode 100644 index 0000000..8c206a5 --- /dev/null +++ b/.github/workflows/pull-request-message-check.yml @@ -0,0 +1,23 @@ +--- +name: Check pull request message format + +on: + pull_request: + branches: + - current + - crux + - equuleus + +jobs: + check-pr-title: + name: Check pull request title + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + timeout-minutes: 2 + - name: Install the requests library + run: pip3 install requests + - name: Check the PR title + timeout-minutes: 2 + run: | + ./scripts/check-pr-title-and-commit-messages.py '${{ github.event.pull_request.url }}' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..d21d151 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,22 @@ +name: "Issue and PR stale management" +on: + schedule: + - cron: "0 0 * * *" + +jobs: + stale: + runs-on: ubuntu-latest + if: github.repository == 'vyos/vyos-1x' + steps: + # Issue stale management + - uses: actions/stale@v6 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + days-before-stale: 90 + days-before-close: -1 + stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. The issue will be reviewed by a maintainer and may be closed' + stale-issue-label: 'state: stale' + exempt-issue-labels: 'state: accepted, state: in-progress' + stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. The PR will be reviewed by a maintainer and may be closed' + stale-pr-label: 'state: stale' + exempt-pr-labels: 'state: accepted, state: in-progress' diff --git a/.github/workflows/unused-imports.yml b/.github/workflows/unused-imports.yml new file mode 100644 index 0000000..da57bd2 --- /dev/null +++ b/.github/workflows/unused-imports.yml @@ -0,0 +1,22 @@ +name: Check for unused imports using Pylint +on: + pull_request_target: + branches: + - current + - sagitta + +jobs: + Check-Unused-Imports: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: 3.11 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install pylint + - name: Analysing the code with pylint + run: make unused-imports -- cgit v1.2.3 From 2c31d715f5bf9b44450b15e9a05bc0d070b0c12f Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Wed, 8 May 2024 16:04:25 +0530 Subject: T6315: fixed PR review comments on repo pr template and workflows --- .github/PULL_REQUEST_TEMPLATE.md | 13 ------------- .github/labeler.yml | 3 --- .github/workflows/pull-request-labels.yml | 1 - .github/workflows/pull-request-management.yml | 2 +- .github/workflows/pull-request-message-check.yml | 2 +- 5 files changed, 2 insertions(+), 19 deletions(-) (limited to '.github/workflows') diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index cd348ea..4c8266c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,6 @@ the box, please use [x] - [ ] New feature (non-breaking change which adds functionality) - [ ] Code style update (formatting, renaming) - [ ] Refactoring (no functional changes) -- [ ] Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component - [ ] Other (please describe): ## Related Task(s) @@ -24,9 +23,6 @@ the box, please use [x] ## Related PR(s) -## Component(s) name - - ## Proposed changes @@ -40,21 +36,12 @@ like this ``` --> -## Smoketest result - - ## Checklist: - [ ] I have read the [**CONTRIBUTING**](https://github.com/vyos/vyos-1x/blob/current/CONTRIBUTING.md) document - [ ] I have linked this PR to one or more Phabricator Task(s) -- [ ] I have run the components [**SMOKETESTS**](https://github.com/vyos/vyos-1x/tree/current/smoketest/scripts/cli) if applicable - [ ] My commit headlines contain a valid Task id - [ ] My change requires a change to the documentation - [ ] I have updated the documentation accordingly diff --git a/.github/labeler.yml b/.github/labeler.yml index e0b9ee4..3a16d27 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -4,9 +4,6 @@ equuleus: current: - any: - base-branch: 'current' -crux: - - any: - - base-branch: 'crux' sagitta: - any: - base-branch: 'sagitta' diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml index 43856be..31e1bd9 100644 --- a/.github/workflows/pull-request-labels.yml +++ b/.github/workflows/pull-request-labels.yml @@ -5,7 +5,6 @@ on: pull_request_target: branches: - current - - crux - equuleus - sagitta diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml index 3a855c1..9918649 100644 --- a/.github/workflows/pull-request-management.yml +++ b/.github/workflows/pull-request-management.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - current - - crux + - sagitta - equuleus jobs: diff --git a/.github/workflows/pull-request-message-check.yml b/.github/workflows/pull-request-message-check.yml index 8c206a5..aee2dec 100644 --- a/.github/workflows/pull-request-message-check.yml +++ b/.github/workflows/pull-request-message-check.yml @@ -5,7 +5,7 @@ on: pull_request: branches: - current - - crux + - sagitta - equuleus jobs: -- cgit v1.2.3 From 84627dba07a4c0c7b4f4e791427b7ce108bf3aac Mon Sep 17 00:00:00 2001 From: kumvijaya Date: Wed, 8 May 2024 16:15:02 +0530 Subject: T6315: fixed PR review comments on runner usage --- .github/workflows/pull-request-management.yml | 2 +- .github/workflows/pull-request-message-check.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml index 9918649..34c9c45 100644 --- a/.github/workflows/pull-request-management.yml +++ b/.github/workflows/pull-request-management.yml @@ -11,7 +11,7 @@ on: jobs: j2lint: name: Validate j2 files - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 timeout-minutes: 2 diff --git a/.github/workflows/pull-request-message-check.yml b/.github/workflows/pull-request-message-check.yml index aee2dec..2487879 100644 --- a/.github/workflows/pull-request-message-check.yml +++ b/.github/workflows/pull-request-message-check.yml @@ -11,7 +11,7 @@ on: jobs: check-pr-title: name: Check pull request title - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 timeout-minutes: 2 -- cgit v1.2.3