1
0
Fork 0
mirror of https://github.com/cisagov/log4j-affected-db.git synced 2024-11-14 12:57:55 +00:00

Merge branch 'develop' into develop

This commit is contained in:
justmurphy 2022-04-14 11:32:19 -04:00 committed by GitHub
commit cd4f252c92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 9 deletions

View file

@ -11,6 +11,10 @@ updates:
directory: "/" directory: "/"
schedule: schedule:
interval: "weekly" interval: "weekly"
ignore:
- dependency-name: actions/cache
- dependency-name: actions/checkout
- dependency-name: actions/setup-python
- package-ecosystem: "pip" - package-ecosystem: "pip"
directory: "/" directory: "/"

View file

@ -17,16 +17,16 @@ jobs:
steps: steps:
- id: setup-env - id: setup-env
uses: cisagov/setup-env-github-action@develop uses: cisagov/setup-env-github-action@develop
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- id: setup-python - id: setup-python
uses: actions/setup-python@v2 uses: actions/setup-python@v3
with: with:
python-version: "3.10" python-version: "3.10"
# We need the Go version and Go cache location for the actions/cache step, # We need the Go version and Go cache location for the actions/cache step,
# so the Go installation must happen before that. # so the Go installation must happen before that.
- uses: actions/setup-go@v2 - uses: actions/setup-go@v2
with: with:
go-version: '1.16' go-version: "1.16"
- name: Store installed Go version - name: Store installed Go version
id: go-version id: go-version
run: | run: |
@ -36,7 +36,7 @@ jobs:
id: go-cache id: go-cache
run: | run: |
echo "::set-output name=dir::$(go env GOCACHE)" echo "::set-output name=dir::$(go env GOCACHE)"
- uses: actions/cache@v2 - uses: actions/cache@v3
env: env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-\ py${{ steps.setup-python.outputs.python-version }}-\

View file

@ -43,14 +43,14 @@ jobs:
# Don't run if we're seeing an update push # Don't run if we're seeing an update push
if: github.actor != needs.setup.outputs.git_user if: github.actor != needs.setup.outputs.git_user
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
token: ${{ secrets.CISAGOVBOT_PAT }} token: ${{ secrets.CISAGOVBOT_PAT }}
- id: setup-python - id: setup-python
uses: actions/setup-python@v2 uses: actions/setup-python@v3
with: with:
python-version: "3.10" python-version: "3.10"
- uses: actions/cache@v2 - uses: actions/cache@v3
env: env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\ BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-" py${{ steps.setup-python.outputs.python-version }}-"
@ -86,7 +86,7 @@ jobs:
- generate_updates - generate_updates
if: needs.generate_updates.outputs.has_updates == 'true' if: needs.generate_updates.outputs.has_updates == 'true'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
token: ${{ secrets.CISAGOVBOT_PAT }} token: ${{ secrets.CISAGOVBOT_PAT }}
- name: Configure git - name: Configure git

View file

@ -37,7 +37,7 @@ repos:
args: args:
- --config=.mdl_config.yaml - --config=.mdl_config.yaml
- repo: https://github.com/pre-commit/mirrors-prettier - repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.5.1 rev: v2.6.1
hooks: hooks:
- id: prettier - id: prettier
- repo: https://github.com/adrienverge/yamllint - repo: https://github.com/adrienverge/yamllint
@ -47,6 +47,13 @@ repos:
args: args:
- --strict - --strict
# GitHub Actions hooks
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.14.2
hooks:
- id: check-github-actions
- id: check-github-workflows
# Shell script hooks # Shell script hooks
- repo: https://github.com/cisagov/pre-commit-shfmt - repo: https://github.com/cisagov/pre-commit-shfmt
rev: v0.0.2 rev: v0.0.2