Skip to content

Commit a6ea199

Browse files
authored
Merge pull request #153 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 2f4b107 + 09f3ff2 commit a6ea199

14 files changed

+659
-272
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,19 @@ updates:
1111
# Managed by cisagov/skeleton-generic
1212
- dependency-name: actions/cache
1313
- dependency-name: actions/checkout
14+
- dependency-name: actions/dependency-review-action
1415
- dependency-name: actions/setup-go
1516
- dependency-name: actions/setup-python
17+
- dependency-name: cisagov/action-job-preamble
1618
- dependency-name: cisagov/setup-env-github-action
17-
- dependency-name: crazy-max/ghaction-dump-context
1819
- dependency-name: crazy-max/ghaction-github-labeler
19-
- dependency-name: crazy-max/ghaction-github-status
20-
- dependency-name: GitHubSecurityLab/actions-permissions
20+
- dependency-name: github/codeql-action
2121
- dependency-name: hashicorp/setup-packer
2222
- dependency-name: hashicorp/setup-terraform
2323
- dependency-name: mxschmitt/action-tmate
24-
- dependency-name: step-security/harden-runner
2524
# Managed by cisagov/skeleton-python-library
2625
- dependency-name: actions/download-artifact
2726
- dependency-name: actions/upload-artifact
28-
- dependency-name: github/codeql-action
2927
package-ecosystem: github-actions
3028
schedule:
3129
interval: weekly

.github/labels.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,72 @@
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: eb6420
66
description: This issue or pull request is awaiting the outcome of another issue or pull request
77
name: blocked
88
- color: "000000"
99
description: This issue or pull request involves changes to existing functionality
1010
name: breaking change
11-
- color: "d73a4a"
11+
- color: d73a4a
1212
description: This issue or pull request addresses broken functionality
1313
name: bug
14-
- color: "07648d"
14+
- color: 07648d
1515
description: This issue will be advertised on code.gov's Open Tasks page (https://code.gov/open-tasks)
1616
name: code.gov
17-
- color: "0366d6"
17+
- color: 0366d6
1818
description: Pull requests that update a dependency file
1919
name: dependencies
20-
- color: "5319e7"
20+
- color: 5319e7
2121
description: This issue or pull request improves or adds to documentation
2222
name: documentation
23-
- color: "cfd3d7"
23+
- color: cfd3d7
2424
description: This issue or pull request already exists or is covered in another issue or pull request
2525
name: duplicate
26-
- color: "b005bc"
26+
- color: b005bc
2727
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
2828
name: epic
2929
- color: "000000"
3030
description: Pull requests that update GitHub Actions code
3131
name: github-actions
32-
- color: "0e8a16"
32+
- color: 0e8a16
3333
description: This issue or pull request is well-defined and good for newcomers
3434
name: good first issue
35-
- color: "ff7518"
35+
- color: ff7518
3636
description: Pull request that should count toward Hacktoberfest participation
3737
name: hacktoberfest-accepted
38-
- color: "a2eeef"
38+
- color: a2eeef
3939
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
4040
name: improvement
41-
- color: "fef2c0"
41+
- color: fef2c0
4242
description: This issue or pull request is not applicable, incorrect, or obsolete
4343
name: invalid
44-
- color: "ce099a"
44+
- color: ce099a
4545
description: This pull request is ready to merge during the next Lineage Kraken release
4646
name: kraken 🐙
47-
- color: "a4fc5d"
47+
- color: a4fc5d
4848
description: This issue or pull request requires further information
4949
name: need info
50-
- color: "fcdb45"
50+
- color: fcdb45
5151
description: This pull request is awaiting an action or decision to move forward
5252
name: on hold
53-
- color: "3772a4"
53+
- color: 3772a4
5454
description: Pull requests that update Python code
5555
name: python
56-
- color: "ef476c"
56+
- color: ef476c
5757
description: This issue is a request for information or needs discussion
5858
name: question
59-
- color: "d73a4a"
59+
- color: d73a4a
6060
description: This issue or pull request addresses a security issue
6161
name: security
62-
- color: "00008b"
62+
- color: 00008b
6363
description: This issue or pull request adds or otherwise modifies test code
6464
name: test
65-
- color: "1d76db"
65+
- color: 1d76db
6666
description: This issue or pull request pulls in upstream updates
6767
name: upstream update
68-
- color: "d4c5f9"
68+
- color: d4c5f9
6969
description: This issue or pull request increments the version number
7070
name: version bump
71-
- color: "ffffff"
71+
- color: ffffff
7272
description: This issue will not be incorporated
7373
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-python-library.git
5-
version: '1'
5+
version: "1"

0 commit comments

Comments
 (0)