Skip to content

Commit d4e7da5

Browse files
authored
Merge pull request #120 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 13405a7 + ddf13c2 commit d4e7da5

File tree

6 files changed

+31
-19
lines changed

6 files changed

+31
-19
lines changed

.github/labeler.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ python:
4444
- changed-files:
4545
- any-glob-to-any-file:
4646
- "**/*.py"
47+
shell script:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
# If this project has any shell scripts that do not end in the ".sh"
51+
# extension, add them below.
52+
- "**/*.sh"
53+
- bump-version
54+
- setup-env
4755
terraform:
4856
- changed-files:
4957
- any-glob-to-any-file:

.github/labels.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Rather than breaking up descriptions into multiline strings we disable that
33
# specific rule in yamllint for this file.
44
# yamllint disable rule:line-length
5-
- color: f15a53
5+
- color: ff5850
66
description: Pull requests that update Ansible code
77
name: ansible
88
- color: eb6420
@@ -20,7 +20,7 @@
2020
- color: 0366d6
2121
description: Pull requests that update a dependency file
2222
name: dependencies
23-
- color: 2497ed
23+
- color: 1d63ed
2424
description: Pull requests that update Docker code
2525
name: docker
2626
- color: 5319e7
@@ -47,7 +47,7 @@
4747
- color: fef2c0
4848
description: This issue or pull request is not applicable, incorrect, or obsolete
4949
name: invalid
50-
- color: f1d642
50+
- color: f0db4f
5151
description: Pull requests that update JavaScript code
5252
name: javascript
5353
- color: ce099a
@@ -62,7 +62,7 @@
6262
- color: 02a8ef
6363
description: Pull requests that update Packer code
6464
name: packer
65-
- color: 3772a4
65+
- color: 3776ab
6666
description: Pull requests that update Python code
6767
name: python
6868
- color: ef476c
@@ -71,13 +71,16 @@
7171
- color: d73a4a
7272
description: This issue or pull request addresses a security issue
7373
name: security
74+
- color: 4eaa25
75+
description: Pull requests that update shell scripts
76+
name: shell script
7477
- color: 7b42bc
7578
description: Pull requests that update Terraform code
7679
name: terraform
7780
- color: 00008b
7881
description: This issue or pull request adds or otherwise modifies test code
7982
name: test
80-
- color: 2b6ebf
83+
- color: 2678c5
8184
description: Pull requests that update TypeScript code
8285
name: typescript
8386
- color: 1d76db

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ jobs:
117117

118118
# Initializes the CodeQL tools for scanning.
119119
- name: Initialize CodeQL
120-
uses: github/codeql-action/init@v3
120+
uses: github/codeql-action/init@v4
121121
with:
122122
languages: ${{ matrix.language }}
123123

124124
# Autobuild attempts to build any compiled languages (C/C++, C#, or
125125
# Java). If this step fails, then you should remove it and run the build
126126
# manually (see below).
127127
- name: Autobuild
128-
uses: github/codeql-action/autobuild@v3
128+
uses: github/codeql-action/autobuild@v4
129129

130130
# ℹ️ Command-line programs to run using the OS shell.
131131
# 📚 https://git.io/JvXDl
@@ -139,4 +139,4 @@ jobs:
139139
# make release
140140

141141
- name: Perform CodeQL Analysis
142-
uses: github/codeql-action/analyze@v3
142+
uses: github/codeql-action/analyze@v4

.github/workflows/label-prs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
permissions:
6060
# Permissions required by actions/labeler
6161
contents: read
62-
issues: write
6362
pull-requests: write
6463
runs-on: ubuntu-latest
6564
steps:

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ repos:
6565

6666
# GitHub Actions hooks
6767
- repo: https://github.com/python-jsonschema/check-jsonschema
68-
rev: 0.33.3
68+
rev: 0.35.0
6969
hooks:
7070
- id: check-github-actions
7171
- id: check-github-workflows
7272

7373
# pre-commit hooks
7474
- repo: https://github.com/pre-commit/pre-commit
75-
rev: v4.3.0
75+
rev: v4.4.0
7676
hooks:
7777
- id: validate_manifest
7878

7979
# Go hooks
8080
- repo: https://github.com/TekWizely/pre-commit-golang
81-
rev: v1.0.0-rc.2
81+
rev: v1.0.0-rc.4
8282
hooks:
8383
# Go Build
8484
- id: go-build-repo-mod
@@ -131,13 +131,13 @@ repos:
131131

132132
# Python hooks
133133
- repo: https://github.com/PyCQA/bandit
134-
rev: 1.8.6
134+
rev: 1.9.1
135135
hooks:
136136
- id: bandit
137137
args:
138138
- --config=.bandit.yml
139139
- repo: https://github.com/psf/black-pre-commit-mirror
140-
rev: 25.1.0
140+
rev: 25.11.0
141141
hooks:
142142
- id: black
143143
- repo: https://github.com/PyCQA/flake8
@@ -147,11 +147,11 @@ repos:
147147
additional_dependencies:
148148
- flake8-docstrings==1.7.0
149149
- repo: https://github.com/PyCQA/isort
150-
rev: 6.0.1
150+
rev: 7.0.0
151151
hooks:
152152
- id: isort
153153
- repo: https://github.com/pre-commit/mirrors-mypy
154-
rev: v1.18.1
154+
rev: v1.18.2
155155
hooks:
156156
- id: mypy
157157
additional_dependencies:
@@ -170,13 +170,13 @@ repos:
170170
- --requirement
171171
- requirements.txt
172172
- repo: https://github.com/asottile/pyupgrade
173-
rev: v3.20.0
173+
rev: v3.21.1
174174
hooks:
175175
- id: pyupgrade
176176

177177
# Ansible hooks
178178
- repo: https://github.com/ansible/ansible-lint
179-
rev: v25.9.0
179+
rev: v25.11.0
180180
hooks:
181181
- id: ansible-lint
182182
additional_dependencies:
@@ -220,7 +220,7 @@ repos:
220220

221221
# Terraform hooks
222222
- repo: https://github.com/antonbabenko/pre-commit-terraform
223-
rev: v1.100.0
223+
rev: v1.103.0
224224
hooks:
225225
- id: terraform_fmt
226226
- id: terraform_validate

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# development-guide #
22

33
[![GitHub Build Status](https://github.com/cisagov/development-guide/workflows/build/badge.svg)](https://github.com/cisagov/development-guide/actions)
4+
[![License](https://img.shields.io/github/license/cisagov/development-guide)](https://spdx.org/licenses/)
5+
[![CodeQL](https://github.com/cisagov/development-guide/workflows/CodeQL/badge.svg)](https://github.com/cisagov/development-guide/actions/workflows/codeql-analysis.yml)
46

57
A set of guidelines and best practices for an awesome engineering team.
68
Heavily "inspired" by the

0 commit comments

Comments
 (0)