Skip to content

Commit

Permalink
Merge pull request #119 from advanced-security/s-samadi/dependency-up…
Browse files Browse the repository at this point in the history
…dates

Dependency Updates
  • Loading branch information
s-samadi authored Dec 9, 2024
2 parents 9e8b8a1 + d78c536 commit 3478381
Show file tree
Hide file tree
Showing 14 changed files with 33,664 additions and 15,354 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set Node.js 16.x
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v4.1.0
with:
node-version: 16.x

Expand All @@ -46,7 +46,7 @@ jobs:
id: diff

# If index.js was different than expected, upload the expected version as an artifact
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: ${{ failure() && steps.diff.conclusion == 'failure' }}
with:
name: dist
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# 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 }}
source-root: src
Expand All @@ -54,7 +54,7 @@ jobs:
# 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@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +68,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/dismiss-alerts-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
packs: advanced-security-demo/${{ matrix.language }}-alert-suppression
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Perform CodeQL Analysis
id: analyze
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
output: ${{ matrix.language }}-sarif-results

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
build: # make sure build/ci work properly
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: |
npm ci
- run: |
Expand Down
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.11.0
36 changes: 19 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,43 @@ CodeQL populates the `suppression` property in its SARIF output based on the res
### Example - CodeQL

```yaml
name: "CodeQL"
name: "CodeQL Advanced"

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]

branches: [main]
schedule:
- cron: "31 7 * * 3"
jobs:
analyze:
name: Analyze
name: Analyze (${{ matrix.language }})
runs-on: ubuntu-latest
permissions:
security-events: write
packages: read
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ "java" ]
include:
- language: java-kotlin
build-mode: none
query: codeql/java-queries:AlertSuppression.ql

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# run an 'alert-suppression' query
packs: "codeql/${{ matrix.language }}-queries:AlertSuppression.ql"

- name: Autobuild
uses: github/codeql-action/autobuild@v2
build-mode: ${{ matrix.build-mode }}
packs: ${{ matrix.query }}

- name: Perform CodeQL Analysis
# define an 'id' for the analysis step
Expand All @@ -61,12 +63,12 @@ jobs:
category: "/language:${{matrix.language}}"
# define the output folder for SARIF files
output: sarif-results

- name: Dismiss alerts
if: github.ref == 'refs/heads/main'
uses: advanced-security/dismiss-alerts@v1
uses: advanced-security/dismiss-alerts@v2
with:
# specify a 'sarif-id' and 'sarif-file'
# specify a 'sarif-id' and 'sarif-file'
sarif-id: ${{ steps.analyze.outputs.sarif-id }}
sarif-file: sarif-results/${{ matrix.language }}.sarif
env:
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ inputs:
description: "Path to the input SARIF file"
required: true
runs:
using: "node16"
using: "node20"
main: "dist/index.js"
Loading

0 comments on commit 3478381

Please sign in to comment.