Skip to content

Commit 2e663c6

Browse files
author
mcdonnnj
committed
# Conflicts: # .github/dependabot.yml # version.txt
2 parents b122bbd + 37010e5 commit 2e663c6

File tree

11 files changed

+219
-33
lines changed

11 files changed

+219
-33
lines changed

.github/dependabot.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
updates:
99
- directory: /
10+
<<<<<<< HEAD
1011
ignore:
1112
# Managed by cisagov/skeleton-generic
1213
- dependency-name: actions/cache
@@ -24,6 +25,29 @@ updates:
2425
# # Managed by cisagov/skeleton-python-library
2526
# - dependency-name: actions/download-artifact
2627
# - dependency-name: actions/upload-artifact
28+
=======
29+
# ignore:
30+
# # Managed by cisagov/skeleton-generic
31+
# - dependency-name: actions/cache
32+
# - dependency-name: actions/checkout
33+
# - dependency-name: actions/dependency-review-action
34+
# - dependency-name: actions/labeler
35+
# - dependency-name: actions/setup-go
36+
# - dependency-name: actions/setup-python
37+
# - dependency-name: cisagov/action-job-preamble
38+
# - dependency-name: cisagov/setup-env-github-action
39+
# - dependency-name: crazy-max/ghaction-github-labeler
40+
# - dependency-name: github/codeql-action
41+
# - dependency-name: hashicorp/setup-packer
42+
# - dependency-name: hashicorp/setup-terraform
43+
# - dependency-name: mxschmitt/action-tmate
44+
labels:
45+
# dependabot default we need to replicate
46+
- dependencies
47+
# This matches our label definition in .github/labels.yml as opposed to
48+
# dependabot's default of `github_actions`.
49+
- github-actions
50+
>>>>>>> 37010e5c528874578c5bd8cbef2d47aa4d2eb561
2751
package-ecosystem: github-actions
2852
schedule:
2953
interval: weekly

.github/labeler.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
# Each entry in this file is a label that will be applied to pull requests
3+
# if there is a match based on the matching rules for the entry. Please see
4+
# the actions/labeler documentation for more information:
5+
# https://github.com/actions/labeler#match-object
6+
#
7+
# Note: Verify that the label you want to use is defined in the
8+
# crazy-max/ghaction-github-labeler configuration file located at
9+
# .github/labels.yml.
10+
11+
# Enable if Ansible playbooks are used in the repository.
12+
# ansible:
13+
# - changed-files:
14+
# - any-glob-to-any-file:
15+
# - "**/ansible/**"
16+
dependencies:
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
# Add any dependency files used.
20+
- .pre-commit-config.yaml
21+
- requirements*.txt
22+
documentation:
23+
- changed-files:
24+
- any-glob-to-any-file:
25+
- "**/*.md"
26+
github-actions:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- .github/workflows/**
30+
# Enable if Packer is used in the repository.
31+
# packer:
32+
# - changed-files:
33+
# - any-glob-to-any-file:
34+
# - "**/*.pkr.hcl"
35+
# Enable if Python is used in the repository.
36+
# python:
37+
# - changed-files:
38+
# - any-glob-to-any-file:
39+
# - "**/*.py"
40+
# Enable if Terraform is used in the repository.
41+
# terraform:
42+
# - changed-files:
43+
# - any-glob-to-any-file:
44+
# - "**/*.tf"
45+
test:
46+
- changed-files:
47+
- any-glob-to-any-file:
48+
# Add any test-related files or paths.
49+
- .ansible-lint
50+
- .bandit.yml
51+
- .flake8
52+
- .isort.cfg
53+
- .mdl_config.yaml
54+
- .yamllint
55+
upstream update:
56+
- head-branch:
57+
# Any Lineage pull requests should use this branch.
58+
- lineage/skeleton
59+
version bump:
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
# Ensure this matches your version tracking file(s).
63+
- version.txt

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ jobs:
9999
# this workflow.
100100
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
101101
- id: setup-env
102-
uses: cisagov/setup-env-github-action@develop
103-
- uses: actions/checkout@v4
102+
uses: cisagov/setup-env-github-action@v1
103+
- uses: actions/checkout@v5
104104
- id: setup-python
105-
uses: actions/setup-python@v5
105+
uses: actions/setup-python@v6
106106
with:
107107
python-version: ${{ steps.setup-env.outputs.python-version }}
108108
# We need the Go version and Go cache location for the actions/cache step,
109109
# so the Go installation must happen before that.
110110
- id: setup-go
111-
uses: actions/setup-go@v5
111+
uses: actions/setup-go@v6
112112
with:
113113
# There is no expectation for actual Go code so we disable caching as
114114
# it relies on the existence of a go.sum file.

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
115115

116116
- name: Checkout repository
117-
uses: actions/checkout@v4
117+
uses: actions/checkout@v5
118118

119119
# Initializes the CodeQL tools for scanning.
120120
- name: Initialize CodeQL

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
9090
- id: checkout-repo
9191
name: Checkout the repository
92-
uses: actions/checkout@v4
92+
uses: actions/checkout@v5
9393
- id: dependency-review
9494
name: Review dependency changes for vulnerabilities and license changes
9595
uses: actions/dependency-review-action@v4

.github/workflows/label-prs.yml

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
---
2+
name: Label pull requests
3+
4+
on: # yamllint disable-line rule:truthy
5+
pull_request:
6+
types:
7+
- edited
8+
- opened
9+
- synchronize
10+
11+
# Set a default shell for any run steps. The `-Eueo pipefail` sets errtrace,
12+
# nounset, errexit, and pipefail. The `-x` will print all commands as they are
13+
# run. Please see the GitHub Actions documentation for more information:
14+
# https://docs.github.com/en/actions/using-jobs/setting-default-values-for-jobs
15+
defaults:
16+
run:
17+
shell: bash -Eueo pipefail -x {0}
18+
19+
jobs:
20+
diagnostics:
21+
name: Run diagnostics
22+
# This job does not need any permissions
23+
permissions: {}
24+
runs-on: ubuntu-latest
25+
steps:
26+
# Note that a duplicate of this step must be added at the top of
27+
# each job.
28+
- name: Apply standard cisagov job preamble
29+
uses: cisagov/action-job-preamble@v1
30+
with:
31+
check_github_status: "true"
32+
# This functionality is poorly implemented and has been
33+
# causing problems due to the MITM implementation hogging or
34+
# leaking memory. As a result we disable it by default. If
35+
# you want to temporarily enable it, simply set
36+
# monitor_permissions equal to "true".
37+
#
38+
# TODO: Re-enable this functionality when practical. See
39+
# cisagov/skeleton-generic#207 for more details.
40+
monitor_permissions: "false"
41+
output_workflow_context: "true"
42+
# Use a variable to specify the permissions monitoring
43+
# configuration. By default this will yield the
44+
# configuration stored in the cisagov organization-level
45+
# variable, but if you want to use a different configuration
46+
# then simply:
47+
# 1. Create a repository-level variable with the name
48+
# ACTIONS_PERMISSIONS_CONFIG.
49+
# 2. Set this new variable's value to the configuration you
50+
# want to use for this repository.
51+
#
52+
# Note in particular that changing the permissions
53+
# monitoring configuration *does not* require you to modify
54+
# this workflow.
55+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
56+
label:
57+
needs:
58+
- diagnostics
59+
permissions:
60+
# Permissions required by actions/labeler
61+
contents: read
62+
issues: write
63+
pull-requests: write
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Apply standard cisagov job preamble
67+
uses: cisagov/action-job-preamble@v1
68+
with:
69+
# This functionality is poorly implemented and has been
70+
# causing problems due to the MITM implementation hogging or
71+
# leaking memory. As a result we disable it by default. If
72+
# you want to temporarily enable it, simply set
73+
# monitor_permissions equal to "true".
74+
#
75+
# TODO: Re-enable this functionality when practical. See
76+
# cisagov/skeleton-generic#207 for more details.
77+
monitor_permissions: "false"
78+
# Use a variable to specify the permissions monitoring
79+
# configuration. By default this will yield the
80+
# configuration stored in the cisagov organization-level
81+
# variable, but if you want to use a different configuration
82+
# then simply:
83+
# 1. Create a repository-level variable with the name
84+
# ACTIONS_PERMISSIONS_CONFIG.
85+
# 2. Set this new variable's value to the configuration you
86+
# want to use for this repository.
87+
#
88+
# Note in particular that changing the permissions
89+
# monitoring configuration *does not* require you to modify
90+
# this workflow.
91+
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
92+
- name: Apply suitable labels to a pull request
93+
uses: actions/labeler@v6

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
# monitoring configuration *does not* require you to modify
8585
# this workflow.
8686
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
87-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v5
8888
- name: Sync repository labels
8989
if: success()
9090
uses: crazy-max/ghaction-github-labeler@v5

.pre-commit-config.yaml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
---
2+
ci:
3+
# Do not commit changes from running pre-commit for pull requests.
4+
autofix_prs: false
5+
# Autoupdate hooks weekly (this is the default).
6+
autoupdate_schedule: weekly
7+
28
default_language_version:
39
# force all unspecified python hooks to run python3
410
python: python3
@@ -10,7 +16,7 @@ repos:
1016
- id: check-useless-excludes
1117

1218
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v5.0.0
19+
rev: v6.0.0
1420
hooks:
1521
- id: check-case-conflict
1622
- id: check-executables-have-shebangs
@@ -39,38 +45,38 @@ repos:
3945

4046
# Text file hooks
4147
- repo: https://github.com/igorshubovych/markdownlint-cli
42-
rev: v0.44.0
48+
rev: v0.45.0
4349
hooks:
4450
- id: markdownlint
4551
args:
4652
- --config=.mdl_config.yaml
4753
- repo: https://github.com/rbubley/mirrors-prettier
48-
rev: v3.5.3
54+
rev: v3.6.2
4955
hooks:
5056
- id: prettier
5157
- repo: https://github.com/adrienverge/yamllint
52-
rev: v1.37.0
58+
rev: v1.37.1
5359
hooks:
5460
- id: yamllint
5561
args:
5662
- --strict
5763

5864
# GitHub Actions hooks
5965
- repo: https://github.com/python-jsonschema/check-jsonschema
60-
rev: 0.32.1
66+
rev: 0.33.3
6167
hooks:
6268
- id: check-github-actions
6369
- id: check-github-workflows
6470

6571
# pre-commit hooks
6672
- repo: https://github.com/pre-commit/pre-commit
67-
rev: v4.2.0
73+
rev: v4.3.0
6874
hooks:
6975
- id: validate_manifest
7076

7177
# Go hooks
7278
- repo: https://github.com/TekWizely/pre-commit-golang
73-
rev: v1.0.0-rc.1
79+
rev: v1.0.0-rc.2
7480
hooks:
7581
# Go Build
7682
- id: go-build-repo-mod
@@ -99,7 +105,7 @@ repos:
99105

100106
# Shell script hooks
101107
- repo: https://github.com/scop/pre-commit-shfmt
102-
rev: v3.11.0-1
108+
rev: v3.12.0-2
103109
hooks:
104110
- id: shfmt
105111
args:
@@ -117,14 +123,14 @@ repos:
117123
# Redirect operators are followed by a space
118124
- --space-redirects
119125
- repo: https://github.com/shellcheck-py/shellcheck-py
120-
rev: v0.10.0.1
126+
rev: v0.11.0.1
121127
hooks:
122128
- id: shellcheck
123129

124130
# Python hooks
125131
# Run bandit on the "tests" tree with a configuration
126132
- repo: https://github.com/PyCQA/bandit
127-
rev: 1.8.3
133+
rev: 1.8.6
128134
hooks:
129135
- id: bandit
130136
name: bandit (tests tree)
@@ -143,7 +149,7 @@ repos:
143149
hooks:
144150
- id: black
145151
- repo: https://github.com/PyCQA/flake8
146-
rev: 7.1.2
152+
rev: 7.3.0
147153
hooks:
148154
- id: flake8
149155
additional_dependencies:
@@ -153,7 +159,7 @@ repos:
153159
hooks:
154160
- id: isort
155161
- repo: https://github.com/pre-commit/mirrors-mypy
156-
rev: v1.15.0
162+
rev: v1.18.1
157163
hooks:
158164
- id: mypy
159165
# IMPORTANT: Keep type hinting-related dependencies of the
@@ -164,7 +170,7 @@ repos:
164170
- types-docopt
165171
- types-setuptools
166172
- repo: https://github.com/pypa/pip-audit
167-
rev: v2.8.0
173+
rev: v2.9.0
168174
hooks:
169175
- id: pip-audit
170176
args:
@@ -176,13 +182,13 @@ repos:
176182
- --requirement
177183
- requirements.txt
178184
- repo: https://github.com/asottile/pyupgrade
179-
rev: v3.19.1
185+
rev: v3.20.0
180186
hooks:
181187
- id: pyupgrade
182188

183189
# Ansible hooks
184190
- repo: https://github.com/ansible/ansible-lint
185-
rev: v25.4.0
191+
rev: v25.9.0
186192
hooks:
187193
- id: ansible-lint
188194
additional_dependencies:
@@ -226,7 +232,7 @@ repos:
226232

227233
# Terraform hooks
228234
- repo: https://github.com/antonbabenko/pre-commit-terraform
229-
rev: v1.98.0
235+
rev: v1.100.0
230236
hooks:
231237
- id: terraform_fmt
232238
- id: terraform_validate
@@ -239,7 +245,7 @@ repos:
239245

240246
# Packer hooks
241247
- repo: https://github.com/cisagov/pre-commit-packer
242-
rev: v0.3.0
248+
rev: v0.3.1
243249
hooks:
244250
- id: packer_fmt
245251
- id: packer_validate

0 commit comments

Comments
 (0)