From a1d082bdbb0436c0ce33ea505cb93b5ca5c5192a Mon Sep 17 00:00:00 2001 From: Hare Sudhan Date: Tue, 1 Aug 2023 21:24:22 -0400 Subject: [PATCH] YAML schema fix (#2505) * yaml schema fix * change yaml structure --- .github/workflows/assign-labels.yml | 6 +----- .github/workflows/generate-counter.yml | 3 +-- .github/workflows/generate-docs.yml | 9 +++------ bin/validate/atomic-red-team.schema.yaml | 5 +++++ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/assign-labels.yml b/.github/workflows/assign-labels.yml index 921e10be..1218c71f 100644 --- a/.github/workflows/assign-labels.yml +++ b/.github/workflows/assign-labels.yml @@ -41,10 +41,6 @@ jobs: let fs = require('fs'); const obj = JSON.parse(fs.readFileSync('./labels.json')); console.log(obj) - const existingAssignees = await github.rest.issues.listAssignees({ - owner: context.repo.owner, - repo: context.repo.repo, - }); if(obj.labels.length > 0){ await github.rest.issues.addLabels({ issue_number: obj.pr, @@ -53,7 +49,7 @@ jobs: labels: obj.labels }) } - if(obj.maintainers.length > 0 && existingAssignees.data.length === 0){ + if(obj.maintainers.length > 0){ await github.rest.issues.addAssignees({ issue_number: obj.pr, owner: context.repo.owner, diff --git a/.github/workflows/generate-counter.yml b/.github/workflows/generate-counter.yml index 5c0bae7f..00e9f6d7 100644 --- a/.github/workflows/generate-counter.yml +++ b/.github/workflows/generate-counter.yml @@ -2,8 +2,7 @@ name: generate-svg-counter on: push: - branches: - - master + branches: ["master"] jobs: generate-counter: diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index 64798f65..8fbcdb85 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -1,17 +1,14 @@ name: generate-docs on: push: - branches: - - master + branches: ["master"] + jobs: generate-docs: runs-on: ubuntu-latest steps: - name: checkout repo - uses: actions/checkout@v2 - with: - token: ${{ secrets.PROTECTED_BRANCH_PUSH_TOKEN }} - ref: 'master' + uses: actions/checkout@v3 - name: setup ruby uses: ruby/setup-ruby@v1 diff --git a/bin/validate/atomic-red-team.schema.yaml b/bin/validate/atomic-red-team.schema.yaml index 13f4fff1..9f03c2bb 100644 --- a/bin/validate/atomic-red-team.schema.yaml +++ b/bin/validate/atomic-red-team.schema.yaml @@ -78,6 +78,8 @@ $defs: enum: - integer - float + - Integer + - Float default: type: - number @@ -91,6 +93,9 @@ $defs: - path - url - string + - Path + - Url + - String default: type: - string