From 0112a45476601551d14327718537044de3f591c0 Mon Sep 17 00:00:00 2001 From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com> Date: Fri, 12 Aug 2022 18:24:40 -0400 Subject: [PATCH] Fix branch names. --- .github/workflows/codeql-analysis.yml | 58 +++++++++++++------------- .github/workflows/main.yml | 3 +- .github/workflows/njsscan-analysis.yml | 28 ++++++------- 3 files changed, 44 insertions(+), 45 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ae4004d..0855476 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,12 +13,12 @@ name: "CodeQL" on: push: - branches: [ main, stable ] + branches: [main, stable] pull_request: # The branches below must be a subset of the branches above - branches: [ main, stable ] + branches: [main, stable] schedule: - - cron: '21 19 * * 4' + - cron: "21 19 * * 4" jobs: analyze: @@ -32,39 +32,39 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ["javascript"] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://git.io/codeql-language-support steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v2 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 - # â„šī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # â„šī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # âœī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5ed7d18..ae1f4aa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,14 +6,13 @@ name: Node.js CI on: # Trigger the workflow on push or pull request, push: - branches: [ master, stable ] + branches: [main, stable] pull_request: # These types of PRs types: [opened, synchronize, reopened] jobs: build: - runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/njsscan-analysis.yml b/.github/workflows/njsscan-analysis.yml index a0775b7..7d83643 100644 --- a/.github/workflows/njsscan-analysis.yml +++ b/.github/workflows/njsscan-analysis.yml @@ -10,26 +10,26 @@ name: njsscan sarif on: push: - branches: [ main, stable ] + branches: [main, stable] pull_request: # The branches below must be a subset of the branches above - branches: [ main, stable ] + branches: [main, stable] schedule: - - cron: '15 15 * * 5' + - cron: "15 15 * * 5" jobs: njsscan: runs-on: ubuntu-latest name: njsscan code scanning steps: - - name: Checkout the code - uses: actions/checkout@v2 - - name: nodejsscan scan - id: njsscan - uses: ajinabraham/njsscan-action@7237412fdd36af517e2745077cedbf9d6900d711 - with: - args: '. --sarif --output results.sarif || true' - - name: Upload njsscan report - uses: github/codeql-action/upload-sarif@v1 - with: - sarif_file: results.sarif + - name: Checkout the code + uses: actions/checkout@v2 + - name: nodejsscan scan + id: njsscan + uses: ajinabraham/njsscan-action@7237412fdd36af517e2745077cedbf9d6900d711 + with: + args: ". --sarif --output results.sarif || true" + - name: Upload njsscan report + uses: github/codeql-action/upload-sarif@v1 + with: + sarif_file: results.sarif