diff options
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 1 | ||||
| -rw-r--r-- | .github/labeler.yml | 12 | ||||
| -rw-r--r-- | .github/reviewers.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/add-pr-labels.yml | 16 | ||||
| -rw-r--r-- | .github/workflows/add-rebase-label.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/auto-author-assign.yml | 21 | ||||
| -rw-r--r-- | .github/workflows/check-pr-conflicts.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/check-pr-message.yml | 17 | ||||
| -rw-r--r-- | .github/workflows/check-stale.yml | 13 | ||||
| -rw-r--r-- | .github/workflows/codeql.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/label-backport.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/mergifyio_backport.yml | 22 | ||||
| -rw-r--r-- | .github/workflows/pr-conflicts.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/pull-request-labels.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/pull-request-management.yml | 25 | ||||
| -rw-r--r-- | .github/workflows/pull-request-message-check.yml | 23 | ||||
| -rw-r--r-- | .github/workflows/sonarcloud.yml | 28 | ||||
| -rw-r--r-- | .github/workflows/trigger-rebuild-repo-package.yml | 32 | ||||
| -rw-r--r-- | CODEOWNERS | 1 | ||||
| -rw-r--r-- | Jenkinsfile | 24 | 
20 files changed, 181 insertions, 165 deletions
| diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 57f0835..8c05645 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -53,7 +53,6 @@ test_01_simple_options (__main__.TestFeature.test_01_simple_options) ... ok  <!--- The entire development process is outlined here: https://docs.vyos.io/en/latest/contributing/development.html -->  - [ ] 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 deleted file mode 100644 index e0b9ee4..0000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index a1647d2..0000000 --- a/.github/reviewers.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -"**/*": -  - team: reviewers diff --git a/.github/workflows/add-pr-labels.yml b/.github/workflows/add-pr-labels.yml new file mode 100644 index 0000000..a0c0760 --- /dev/null +++ b/.github/workflows/add-pr-labels.yml @@ -0,0 +1,16 @@ +--- +name: Add pull request labels + +on: +  pull_request_target: +    branches: +      - current + +permissions: +  pull-requests: write +  contents: read + +jobs: +  add-pr-label: +    uses: vyos/.github/.github/workflows/add-pr-labels.yml@current +    secrets: inherit diff --git a/.github/workflows/add-rebase-label.yml b/.github/workflows/add-rebase-label.yml new file mode 100644 index 0000000..9041303 --- /dev/null +++ b/.github/workflows/add-rebase-label.yml @@ -0,0 +1,14 @@ +name: Add rebase label + +on: +  pull_request_target: +    types: [synchronize, opened, reopened, labeled, unlabeled] + +permissions: +  pull-requests: write +  contents: read + +jobs: +  add-rebase-label: +    uses: vyos/.github/.github/workflows/add-rebase-label.yml@current +    secrets: inherit diff --git a/.github/workflows/auto-author-assign.yml b/.github/workflows/auto-author-assign.yml index 1a7f8ef..61612cc 100644 --- a/.github/workflows/auto-author-assign.yml +++ b/.github/workflows/auto-author-assign.yml @@ -3,25 +3,12 @@ on:    pull_request_target:      types: [opened, reopened, ready_for_review, locked] +  permissions:    pull-requests: write +  contents: read  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 +    uses: vyos/.github/.github/workflows/assign-author.yml@current +    secrets: inherit diff --git a/.github/workflows/check-pr-conflicts.yml b/.github/workflows/check-pr-conflicts.yml new file mode 100644 index 0000000..f09e664 --- /dev/null +++ b/.github/workflows/check-pr-conflicts.yml @@ -0,0 +1,14 @@ + +name: "PR Conflicts checker" +on: +  pull_request_target: +    types: [synchronize] + +permissions: +  pull-requests: write +  contents: read + +jobs: +  check-pr-conflict-call: +    uses: vyos/.github/.github/workflows/check-pr-merge-conflict.yml@current +    secrets: inherit diff --git a/.github/workflows/check-pr-message.yml b/.github/workflows/check-pr-message.yml new file mode 100644 index 0000000..625ba2d --- /dev/null +++ b/.github/workflows/check-pr-message.yml @@ -0,0 +1,17 @@ +--- +name: Check pull request message format + +on: +  pull_request_target: +    branches: +      - current +    types: [opened, synchronize, edited] + +permissions: +  pull-requests: write +  contents: read + +jobs: +  check-pr-title: +    uses: vyos/.github/.github/workflows/check-pr-message.yml@current +    secrets: inherit diff --git a/.github/workflows/check-stale.yml b/.github/workflows/check-stale.yml new file mode 100644 index 0000000..2adbee2 --- /dev/null +++ b/.github/workflows/check-stale.yml @@ -0,0 +1,13 @@ +name: "Issue and PR stale management" +on: +  schedule: +  - cron: "0 0 * * *" + +permissions: +  pull-requests: write +  contents: read + +jobs: +  stale: +    uses: vyos/.github/.github/workflows/check-stale.yml@current +    secrets: inherit diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..9671d45 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,30 @@ +name: "Perform CodeQL Analysis" + +on: +  push: +    branches: [ "current" ] +    paths: +      - '**' +      - '!.github/**' +      - '!**/*.md' +  pull_request: +    # The branches below must be a subset of the branches above +    branches: [ "current" ] +    paths: +      - '**' +      - '!.github/**' +      - '!**/*.md' +  schedule: +    - cron: '22 10 * * 0' + +permissions: +  actions: read +  contents: read +  security-events: write + +jobs: +  codeql-analysis-call: +    uses: vyos/.github/.github/workflows/codeql-analysis.yml@current +    secrets: inherit +    with: +      languages: "['cpp']" diff --git a/.github/workflows/label-backport.yml b/.github/workflows/label-backport.yml new file mode 100644 index 0000000..efbd438 --- /dev/null +++ b/.github/workflows/label-backport.yml @@ -0,0 +1,12 @@ +name: Mergifyio backport + +on: [issue_comment] + +permissions: +  pull-requests: write +  contents: read + +jobs: +  mergifyio-backport: +    uses: vyos/.github/.github/workflows/label-backport.yml@current +    secrets: inherit diff --git a/.github/workflows/mergifyio_backport.yml b/.github/workflows/mergifyio_backport.yml deleted file mode 100644 index 511b26c..0000000 --- a/.github/workflows/mergifyio_backport.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Mergifyio backport - -on: [issue_comment] - -jobs: -  mergifyio_backport: -    if: github.repository == 'vyos/vyatta-wanloadbalance' -    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]ergifyio 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 deleted file mode 100644 index 96040cd..0000000 --- a/.github/workflows/pr-conflicts.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: "PR Conflicts checker" -on: -  pull_request_target: -    types: [synchronize] - -jobs: -  Conflict_Check: -    name: 'Check PR status: conflicts and resolution' -    runs-on: ubuntu-22.04 -    steps: -      - name: check if PRs are dirty -        uses: eps1lon/actions-label-merge-conflict@releases/2.x -        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 deleted file mode 100644 index 778daae..0000000 --- a/.github/workflows/pull-request-labels.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -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-20.04 -    permissions: -      contents: read -      pull-requests: write -    steps: -      - uses: actions/labeler@v5.0.0-alpha.1 diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml deleted file mode 100644 index 3a855c1..0000000 --- a/.github/workflows/pull-request-management.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -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 deleted file mode 100644 index 8c206a5..0000000 --- a/.github/workflows/pull-request-message-check.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -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/sonarcloud.yml b/.github/workflows/sonarcloud.yml new file mode 100644 index 0000000..a8eaca7 --- /dev/null +++ b/.github/workflows/sonarcloud.yml @@ -0,0 +1,28 @@ +name: Sonar Checks +on: +  push: +    branches: +      - current +    paths: +      - '**' +      - '!.github/**' +      - '!**/*.md' +  pull_request_target: +    types: [opened, synchronize, reopened] +    paths: +      - '**' +      - '!.github/**' +      - '!**/*.md' +jobs: +  sonar-cloud: +    name: SonarCloud +    runs-on: ubuntu-latest +    steps: +      - uses: actions/checkout@v3 +        with: +          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis +      - name: SonarCloud Scan +        uses: SonarSource/sonarcloud-github-action@master +        env: +          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any +          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/trigger-rebuild-repo-package.yml b/.github/workflows/trigger-rebuild-repo-package.yml new file mode 100644 index 0000000..37ec832 --- /dev/null +++ b/.github/workflows/trigger-rebuild-repo-package.yml @@ -0,0 +1,32 @@ +name: Trigger to build a deb package from repo + +on: +  pull_request_target: +    types: +      - closed +    branches: +      - current +  workflow_dispatch: + +jobs: +  get_repo_name: +    runs-on: ubuntu-latest +    outputs: +      PACKAGE_NAME: ${{ steps.package_name.outputs.PACKAGE_NAME }} +    steps: +      - name: Set variables +        id: package_name +        run: | +          echo "PACKAGE_NAME=$(basename ${{ github.repository }})" >> $GITHUB_OUTPUT + +  trigger-build: +    needs: get_repo_name +    uses: vyos/.github/.github/workflows/trigger-rebuild-repo-package.yml@current +    with: +      branch: ${{ github.ref_name }} +      package_name: ${{ needs.get_repo_name.outputs.PACKAGE_NAME }} +    secrets: +      REMOTE_OWNER: ${{ secrets.REMOTE_OWNER }} +      REMOTE_REUSE_REPO: ${{ secrets.REMOTE_REUSE_REPO }} +      GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} +      PAT: ${{ secrets.PAT }} diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 0000000..1913942 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1 @@ +* @vyos/reviewers
\ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 8f0e7a4..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,24 +0,0 @@ - -// Copyright (C) 2020-2021 VyOS maintainers and contributors -// -// This program is free software; you can redistribute it and/or modify -// in order to easy exprort images built to "external" world -// it under the terms of the GNU General Public License version 2 or later as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program.  If not, see <http://www.gnu.org/licenses/>. -@NonCPS - -// Using a version specifier library, use 'current' branch. The underscore (_) -// is not a typo! You need this underscore if the line immediately after the -// @Library annotation is not an import statement! -@Library('vyos-build@current')_ - -// Start package build using library function from https://github.com/vyos/vyos-build -buildPackage(null, null, null, true) | 
