Skip to content

Commit

Permalink
Merge branch 'main' into metric_id_constant
Browse files Browse the repository at this point in the history
  • Loading branch information
weichslgartner authored Oct 14, 2024
2 parents e21e691 + 81a15cf commit 734bced
Show file tree
Hide file tree
Showing 16 changed files with 2,798 additions and 2,517 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -76,4 +76,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
github.head_ref
)
)
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
runs-on: 'ubuntu-latest'
timeout-minutes: 120
env:
LONG_TESTS: 1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/update-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ permissions:

jobs:
linux:
if: github.repository == 'intel/cve-bin-tool'
name: Update linux cached database
runs-on: ${{ github.repository_owner == 'intel' && 'intel-ubuntu-latest' || 'ubuntu-latest' }}
runs-on: 'ubuntu-latest'
timeout-minutes: 60
steps:
- name: Harden Runner
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ repos:
exclude: ^fuzz/generated/|bandit\.conf$

- repo: https://github.com/PyCQA/bandit
rev: 1.7.9
rev: 1.7.10
hooks:
- id: bandit
exclude: ^fuzz/generated/
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pre-commit; python_version <= "3.8"
pre-commit==3.8.0; python_version > "3.8"
flake8; python_version < "3.8"
flake8==7.1.1; python_version >= "3.8"
bandit==1.7.9
bandit==1.7.10
gitlint==v0.19.1
interrogate
mypy==v1.11.2
Expand Down
Loading

0 comments on commit 734bced

Please sign in to comment.