Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4ee1bfd
Bump actions/setup-python from 2 to 3
dependabot[bot] Feb 28, 2022
3406c2d
Bump actions/checkout from 2 to 3
dependabot[bot] Mar 7, 2022
9a03808
Update pre-commit hooks
mcdonnnj Mar 28, 2022
511a37c
Add Dependabot ignore directives
mcdonnnj Mar 28, 2022
5839926
Upgrade from Python 3.9 to 3.10 for the `lint` job in GHA
mcdonnnj Mar 28, 2022
e22c12c
Use consistent quoting for software versions
mcdonnnj Mar 28, 2022
a3f12f4
Merge pull request #101 from cisagov/dependabot/github_actions/action…
mcdonnnj Apr 1, 2022
6869c68
Merge branch 'develop' into dependabot/github_actions/actions/checkout-3
mcdonnnj Apr 1, 2022
e190ae7
Merge pull request #102 from cisagov/dependabot/github_actions/action…
mcdonnnj Apr 1, 2022
c576ef5
Bump actions/cache from 2 to 3
dependabot[bot] Apr 1, 2022
496ea93
Merge branch 'develop' into improvement/add_dependabot_ignores_for_gi…
mcdonnnj Apr 1, 2022
a9c93d0
Merge pull request #107 from cisagov/improvement/add_dependabot_ignor…
mcdonnnj Apr 1, 2022
d168151
Merge pull request #104 from cisagov/dependabot/github_actions/action…
mcdonnnj Apr 1, 2022
14aff9c
Merge branch 'develop' into improvement/use_python_3.10_for_gha
mcdonnnj Apr 1, 2022
504ed9e
Merge pull request #106 from cisagov/improvement/use_python_3.10_for_gha
mcdonnnj Apr 1, 2022
57d6ac0
Merge branch 'develop' into maintenance/update_pre-commit_hooks
mcdonnnj Apr 1, 2022
da532a5
Merge pull request #105 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Apr 1, 2022
e75882f
Merge github.com:cisagov/skeleton-generic into lineage/skeleton
mcdonnnj Apr 1, 2022
4d37032
Enable Dependabot ignore directives
mcdonnnj Apr 1, 2022
49d87d4
Add pre-commit hooks to validate GitHub Actions content
mcdonnnj Apr 1, 2022
4215ba3
Merge pull request #109 from cisagov/improvement/add_github_actions_p…
mcdonnnj Apr 6, 2022
16dce55
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Apr 6, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: actions/cache
- dependency-name: actions/checkout
- dependency-name: actions/setup-python

- package-ecosystem: "pip"
directory: "/"
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
steps:
- id: setup-env
uses: cisagov/setup-env-github-action@develop
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.9
python-version: "3.10"
# We need the Go version and Go cache location for the actions/cache step,
# so the Go installation must happen before that.
- uses: actions/setup-go@v2
with:
go-version: '1.16'
go-version: "1.16"
- name: Store installed Go version
id: go-version
run: |
Expand All @@ -38,7 +38,7 @@ jobs:
id: go-cache
run: |
echo "::set-output name=dir::$(go env GOCACHE)"
- uses: actions/cache@v2
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-\
Expand Down Expand Up @@ -118,12 +118,12 @@ jobs:
- "3.9"
- "3.10"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v2
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-"
Expand Down Expand Up @@ -161,12 +161,12 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: 3.9
- uses: actions/cache@v2
python-version: "3.10"
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-"
Expand Down Expand Up @@ -205,12 +205,12 @@ jobs:
- "3.9"
- "3.10"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- id: setup-python
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v2
- uses: actions/cache@v3
env:
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
py${{ steps.setup-python.outputs.python-version }}-"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

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

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
19 changes: 13 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ repos:
args:
- --config=.mdl_config.yaml
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.5.1
rev: v2.6.1
hooks:
- id: prettier
- repo: https://github.com/adrienverge/yamllint
Expand All @@ -47,6 +47,13 @@ repos:
args:
- --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

# pre-commit hooks
- repo: https://github.com/pre-commit/pre-commit
rev: v2.17.0
Expand Down Expand Up @@ -76,7 +83,7 @@ repos:
# Python hooks
# Run bandit on "tests" tree with a configuration
- repo: https://github.com/PyCQA/bandit
rev: 1.7.2
rev: 1.7.4
hooks:
- id: bandit
name: bandit (tests tree)
Expand All @@ -91,7 +98,7 @@ repos:
name: bandit (everything else)
exclude: tests
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
Expand All @@ -105,13 +112,13 @@ repos:
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
rev: v0.942
hooks:
- id: mypy
additional_dependencies:
- types-setuptools
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.31.1
hooks:
- id: pyupgrade

Expand All @@ -131,7 +138,7 @@ repos:

# Docker hooks
- repo: https://github.com/IamTheFij/docker-pre-commit
rev: v2.0.1
rev: v2.1.0
hooks:
- id: docker-compose-check

Expand Down