Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update Dependabot ignore directives #101

Merged
merged 32 commits into from
Jun 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ad71ef3
Update pre-commit hooks
mcdonnnj Feb 24, 2022
a05b45a
Add comment to Dependabot configuration
mcdonnnj Feb 25, 2022
77b20ab
Disable comments-indentation rule for yamllint
mcdonnnj Feb 25, 2022
d712690
Merge pull request #99 from cisagov/improvement/update_dependabot_and…
mcdonnnj Feb 25, 2022
3303e46
Merge branch 'develop' into maintenance/update_pre-commit_hooks
mcdonnnj Feb 25, 2022
d0817e2
Merge pull request #98 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Feb 25, 2022
706bded
Use asterisks for emphasis- and strong-styles
mcdonnnj Feb 25, 2022
7868a35
Add missing hyphen in markdownlint rule header
mcdonnnj Feb 25, 2022
6978f2a
Merge pull request #100 from cisagov/improvement/update_markdownlint_…
mcdonnnj Feb 25, 2022
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
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
7e230e1
Merge github.com:cisagov/skeleton-generic into lineage/skeleton
mcdonnnj May 29, 2022
7213771
Enable Dependabot ignore directives
mcdonnnj May 29, 2022
534fb66
Fix issues with the `build.yml` file
mcdonnnj May 29, 2022
d61a7cb
Add Dependabot dependency ownership for this repository
mcdonnnj May 31, 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
17 changes: 17 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
---

# Any ignore directives should be uncommented in downstream projects to disable
# Dependabot updates for the given dependency. Downstream projects will get
# these updates when the pull request(s) in the appropriate skeleton are merged
# and Lineage processes these changes.

version: 2
updates:
- package-ecosystem: "docker"
Expand All @@ -11,6 +16,18 @@ updates:
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: actions/cache
- dependency-name: actions/checkout
- dependency-name: actions/setup-python
# Managed by cisagov/skeleton-docker
# - dependency-name: actions/download-artifact
# - dependency-name: actions/github-script
# - dependency-name: actions/upload-artifact
# - dependency-name: docker/build-push-action
# - dependency-name: docker/#-action
# - dependency-name: docker/setup-buildx-action
# - dependency-name: docker/setup-qemu-action

- package-ecosystem: "pip"
directory: "/"
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ name: build
on:
push:
branches:
- '**'
- "**"
tags:
- 'v*.*.*'
- "v*.*.*"
pull_request:
schedule:
- cron: '0 10 * * *' # everyday at 10am
- cron: "0 10 * * *" # everyday at 10am
repository_dispatch:
# Respond to rebuild requests. See: https://github.com/cisagov/action-apb/
types: [apb]
Expand All @@ -18,11 +18,11 @@ on:
remote-shell:
description: "Debug with remote shell"
required: true
default: false
default: "false"
image-tag:
description: "Tag to apply to pushed images"
required: true
default: dispatch
default: "dispatch"

env:
BUILDX_CACHE_DIR: ~/.cache/buildx
Expand All @@ -43,16 +43,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 @@ -62,7 +62,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 @@ -175,7 +175,7 @@ jobs:
source_version: ${{ steps.prep.outputs.source_version }}
tags: ${{ steps.prep.outputs.tags }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Gather repository metadata
id: repo
uses: actions/github-script@v5
Expand Down Expand Up @@ -234,13 +234,13 @@ jobs:
needs: [prepare]
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
env:
BASE_CACHE_KEY: buildx-${{ runner.os }}-
with:
Expand Down Expand Up @@ -303,13 +303,13 @@ jobs:
runs-on: ubuntu-latest
needs: [build]
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
- name: Cache testing environments
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 @@ -362,13 +362,13 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3
env:
BASE_CACHE_KEY: buildx-${{ runner.os }}-
with:
Expand Down
12 changes: 11 additions & 1 deletion .mdl_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,17 @@ MD035:
# Enforce dashes for horizontal rules
style: "---"

# MD046/code-block-style Code block style
# MD046/code-block-style - Code block style
MD046:
# Enforce the fenced style for code blocks
style: "fenced"

# MD049/emphasis-style - Emphasis style should be consistent
MD049:
# Enforce asterisks as the style to use for emphasis
style: "asterisk"

# MD050/strong-style - Strong style should be consistent
MD050:
# Enforce asterisks as the style to use for strong
style: "asterisk"
27 changes: 17 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ repos:

# Text file hooks
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.30.0
rev: v0.31.1
hooks:
- id: markdownlint
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 @@ -48,9 +48,16 @@ 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.16.0
rev: v2.17.0
hooks:
- id: validate_manifest

Expand All @@ -76,7 +83,7 @@ repos:

# Python hooks
- repo: https://github.com/PyCQA/bandit
rev: 1.7.1
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: 21.12b0
rev: 22.3.0
hooks:
- id: black
- repo: https://gitlab.com/pycqa/flake8
Expand All @@ -105,31 +112,31 @@ repos:
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
rev: v0.942
hooks:
- id: mypy
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.0
rev: v2.31.1
hooks:
- id: pyupgrade

# Ansible hooks
- repo: https://github.com/ansible-community/ansible-lint
rev: v5.3.2
rev: v5.4.0
hooks:
- id: ansible-lint
# files: molecule/default/playbook.yml

# Terraform hooks
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.62.3
rev: v1.64.0
hooks:
- id: terraform_fmt
- id: terraform_validate

# 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
6 changes: 6 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
extends: default

rules:
# yamllint does not like it when you comment out different parts of
# dictionaries in a list. You can see
# https://github.com/adrienverge/yamllint/issues/384 for some examples of
# this behavior.
comments-indentation: disable

# yamllint doesn't like when we use yes and no for true and false,
# but that's pretty standard in Ansible.
truthy: disable