Skip to content

Commit 0234608

Browse files
authored
Merge pull request #34 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 57bcc5b + b1b3495 commit 0234608

22 files changed

+992
-237
lines changed

.github/CODEOWNERS

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
# These owners will be the default owners for everything in the
44
# repo. Unless a later match takes precedence, these owners will be
55
# requested for review when someone opens a pull request.
6-
* @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
6+
* @dav3r @felddy @jsf9k @mcdonnnj
77

88
# These folks own any files in the .github directory at the root of
99
# the repository and any of its subdirectories.
10-
/.github/ @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
10+
/.github/ @dav3r @felddy @jsf9k @mcdonnnj
1111

1212
# These folks own all linting configuration files.
13-
/.ansible-lint @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
14-
/.bandit.yml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
15-
/.flake8 @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
16-
/.isort.cfg @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
17-
/.mdl_config.yaml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
18-
/.pre-commit-config.yaml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
19-
/.prettierignore @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
20-
/.yamllint @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
21-
/requirements.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
22-
/requirements-dev.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
23-
/requirements-test.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
24-
/setup-env @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
13+
/.ansible-lint @dav3r @felddy @jsf9k @mcdonnnj
14+
/.bandit.yml @dav3r @felddy @jsf9k @mcdonnnj
15+
/.flake8 @dav3r @felddy @jsf9k @mcdonnnj
16+
/.isort.cfg @dav3r @felddy @jsf9k @mcdonnnj
17+
/.mdl_config.yaml @dav3r @felddy @jsf9k @mcdonnnj
18+
/.pre-commit-config.yaml @dav3r @felddy @jsf9k @mcdonnnj
19+
/.prettierignore @dav3r @felddy @jsf9k @mcdonnnj
20+
/.yamllint @dav3r @felddy @jsf9k @mcdonnnj
21+
/requirements.txt @dav3r @felddy @jsf9k @mcdonnnj
22+
/requirements-dev.txt @dav3r @felddy @jsf9k @mcdonnnj
23+
/requirements-test.txt @dav3r @felddy @jsf9k @mcdonnnj
24+
/setup-env @dav3r @felddy @jsf9k @mcdonnnj

.github/dependabot.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,25 @@ updates:
1111
# Managed by cisagov/skeleton-generic
1212
- dependency-name: actions/cache
1313
- dependency-name: actions/checkout
14+
- dependency-name: actions/dependency-review-action
15+
- dependency-name: actions/labeler
1416
- dependency-name: actions/setup-go
1517
- dependency-name: actions/setup-python
16-
- dependency-name: crazy-max/ghaction-dump-context
18+
- dependency-name: cisagov/action-job-preamble
19+
- dependency-name: cisagov/setup-env-github-action
1720
- dependency-name: crazy-max/ghaction-github-labeler
18-
- dependency-name: crazy-max/ghaction-github-status
21+
- dependency-name: github/codeql-action
22+
- dependency-name: hashicorp/setup-packer
1923
- dependency-name: hashicorp/setup-terraform
2024
- dependency-name: mxschmitt/action-tmate
21-
- dependency-name: step-security/harden-runner
2225
# # Managed by cisagov/skeleton-aws-lambda-python
2326
# - dependency-name: actions/upload-artifact
24-
# - dependency-name: github/codeql-action
27+
labels:
28+
# dependabot default we need to replicate
29+
- dependencies
30+
# This matches our label definition in .github/labels.yml as opposed to
31+
# dependabot's default of `github_actions`.
32+
- github-actions
2533
package-ecosystem: github-actions
2634
schedule:
2735
interval: weekly

.github/labeler.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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+
ansible:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- "**/ansible/**"
15+
dependencies:
16+
- changed-files:
17+
- any-glob-to-any-file:
18+
# Add any dependency files used.
19+
- .pre-commit-config.yaml
20+
- requirements*.txt
21+
docker:
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- "**/compose*.yml"
25+
- "**/docker-compose*.yml"
26+
- "**/Dockerfile*"
27+
documentation:
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- "**/*.md"
31+
github-actions:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- .github/workflows/**
35+
javascript:
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- "**/*.js"
39+
packer:
40+
- changed-files:
41+
- any-glob-to-any-file:
42+
- "**/*.pkr.hcl"
43+
python:
44+
- changed-files:
45+
- any-glob-to-any-file:
46+
- "**/*.py"
47+
terraform:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- "**/*.tf"
51+
test:
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
# Add any test-related files or paths.
55+
- .ansible-lint
56+
- .bandit.yml
57+
- .flake8
58+
- .isort.cfg
59+
- .mdl_config.yaml
60+
- .yamllint
61+
- pytest.ini
62+
- tests/**
63+
typescript:
64+
- changed-files:
65+
- any-glob-to-any-file:
66+
- "**/*.ts"
67+
upstream update:
68+
- head-branch:
69+
# Any Lineage pull requests should use this branch.
70+
- lineage/skeleton
71+
version bump:
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
# Ensure this matches your version tracking file(s).
75+
- src/version.txt

.github/labels.yml

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,90 @@
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: "eb6420"
5+
- color: f15a53
6+
description: Pull requests that update Ansible code
7+
name: ansible
8+
- color: eb6420
69
description: This issue or pull request is awaiting the outcome of another issue or pull request
710
name: blocked
811
- color: "000000"
912
description: This issue or pull request involves changes to existing functionality
1013
name: breaking change
11-
- color: "d73a4a"
14+
- color: d73a4a
1215
description: This issue or pull request addresses broken functionality
1316
name: bug
14-
- color: "07648d"
17+
- color: 07648d
1518
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
1619
name: code.gov
17-
- color: "0366d6"
20+
- color: 0366d6
1821
description: Pull requests that update a dependency file
1922
name: dependencies
20-
- color: "5319e7"
23+
- color: 2497ed
24+
description: Pull requests that update Docker code
25+
name: docker
26+
- color: 5319e7
2127
description: This issue or pull request improves or adds to documentation
2228
name: documentation
23-
- color: "cfd3d7"
29+
- color: cfd3d7
2430
description: This issue or pull request already exists or is covered in another issue or pull request
2531
name: duplicate
26-
- color: "b005bc"
32+
- color: b005bc
2733
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
2834
name: epic
2935
- color: "000000"
3036
description: Pull requests that update GitHub Actions code
3137
name: github-actions
32-
- color: "0e8a16"
38+
- color: 0e8a16
3339
description: This issue or pull request is well-defined and good for newcomers
3440
name: good first issue
35-
- color: "ff7518"
41+
- color: ff7518
3642
description: Pull request that should count toward Hacktoberfest participation
3743
name: hacktoberfest-accepted
38-
- color: "a2eeef"
44+
- color: a2eeef
3945
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
4046
name: improvement
41-
- color: "fef2c0"
47+
- color: fef2c0
4248
description: This issue or pull request is not applicable, incorrect, or obsolete
4349
name: invalid
44-
- color: "ce099a"
50+
- color: f1d642
51+
description: Pull requests that update JavaScript code
52+
name: javascript
53+
- color: ce099a
4554
description: This pull request is ready to merge during the next Lineage Kraken release
4655
name: kraken 🐙
47-
- color: "a4fc5d"
56+
- color: a4fc5d
4857
description: This issue or pull request requires further information
4958
name: need info
50-
- color: "fcdb45"
59+
- color: fcdb45
5160
description: This pull request is awaiting an action or decision to move forward
5261
name: on hold
53-
- color: "3772a4"
62+
- color: 02a8ef
63+
description: Pull requests that update Packer code
64+
name: packer
65+
- color: 3772a4
5466
description: Pull requests that update Python code
5567
name: python
56-
- color: "ef476c"
68+
- color: ef476c
5769
description: This issue is a request for information or needs discussion
5870
name: question
59-
- color: "d73a4a"
71+
- color: d73a4a
6072
description: This issue or pull request addresses a security issue
6173
name: security
62-
- color: "00008b"
74+
- color: 7b42bc
75+
description: Pull requests that update Terraform code
76+
name: terraform
77+
- color: 00008b
6378
description: This issue or pull request adds or otherwise modifies test code
6479
name: test
65-
- color: "1d76db"
80+
- color: 2b6ebf
81+
description: Pull requests that update TypeScript code
82+
name: typescript
83+
- color: 1d76db
6684
description: This issue or pull request pulls in upstream updates
6785
name: upstream update
68-
- color: "d4c5f9"
86+
- color: d4c5f9
6987
description: This issue or pull request increments the version number
7088
name: version bump
71-
- color: "ffffff"
89+
- color: ffffff
7290
description: This issue will not be incorporated
7391
name: wontfix

.github/lineage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
lineage:
33
skeleton:
44
remote-url: https://github.com/cisagov/skeleton-generic.git
5-
version: '1'
5+
version: "1"

0 commit comments

Comments
 (0)