Skip to content

Commit ce800c0

Browse files
author
mcdonnnj
committed
Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton
# Conflicts: # .github/dependabot.yml # .github/lineage.yml # .github/workflows/build.yml
2 parents 214397f + 0738f43 commit ce800c0

10 files changed

+464
-201
lines changed

.github/dependabot.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@ updates:
1616
# Managed by cisagov/skeleton-generic
1717
- dependency-name: actions/cache
1818
- dependency-name: actions/checkout
19+
- dependency-name: actions/dependency-review-action
1920
- dependency-name: actions/setup-go
2021
- dependency-name: actions/setup-python
22+
- dependency-name: cisagov/action-job-preamble
2123
- dependency-name: cisagov/setup-env-github-action
22-
- dependency-name: crazy-max/ghaction-dump-context
2324
- dependency-name: crazy-max/ghaction-github-labeler
24-
- dependency-name: crazy-max/ghaction-github-status
25-
- dependency-name: GitHubSecurityLab/actions-permissions
25+
- dependency-name: github/codeql-action
2626
- dependency-name: hashicorp/setup-packer
2727
- dependency-name: hashicorp/setup-terraform
2828
- dependency-name: mxschmitt/action-tmate
29-
- dependency-name: step-security/harden-runner
3029
# Managed by cisagov/skeleton-docker
3130
<<<<<<< HEAD
3231
- dependency-name: actions/download-artifact
@@ -45,8 +44,11 @@ updates:
4544
# - dependency-name: docker/metadata-action
4645
# - dependency-name: docker/setup-buildx-action
4746
# - dependency-name: docker/setup-qemu-action
47+
<<<<<<< HEAD
4848
# - dependency-name: github/codeql-action
4949
>>>>>>> 7a5cddf2432f7e49c0f775066739b9464ad66332
50+
=======
51+
>>>>>>> 0738f439376911e13c847d4114337f8ba95d1321
5052
package-ecosystem: github-actions
5153
schedule:
5254
interval: weekly

.github/labels.yml

+21-21
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: "2497ed"
20+
- color: 2497ed
2121
description: Pull requests that update Docker code
2222
name: docker
23-
- color: "5319e7"
23+
- color: 5319e7
2424
description: This issue or pull request improves or adds to documentation
2525
name: documentation
26-
- color: "cfd3d7"
26+
- color: cfd3d7
2727
description: This issue or pull request already exists or is covered in another issue or pull request
2828
name: duplicate
29-
- color: "b005bc"
29+
- color: b005bc
3030
description: A high-level objective issue encompassing multiple issues instead of a specific unit of work
3131
name: epic
3232
- color: "000000"
3333
description: Pull requests that update GitHub Actions code
3434
name: github-actions
35-
- color: "0e8a16"
35+
- color: 0e8a16
3636
description: This issue or pull request is well-defined and good for newcomers
3737
name: good first issue
38-
- color: "ff7518"
38+
- color: ff7518
3939
description: Pull request that should count toward Hacktoberfest participation
4040
name: hacktoberfest-accepted
41-
- color: "a2eeef"
41+
- color: a2eeef
4242
description: This issue or pull request will add or improve functionality, maintainability, or ease of use
4343
name: improvement
44-
- color: "fef2c0"
44+
- color: fef2c0
4545
description: This issue or pull request is not applicable, incorrect, or obsolete
4646
name: invalid
47-
- color: "ce099a"
47+
- color: ce099a
4848
description: This pull request is ready to merge during the next Lineage Kraken release
4949
name: kraken 🐙
50-
- color: "a4fc5d"
50+
- color: a4fc5d
5151
description: This issue or pull request requires further information
5252
name: need info
53-
- color: "fcdb45"
53+
- color: fcdb45
5454
description: This pull request is awaiting an action or decision to move forward
5555
name: on hold
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

0 commit comments

Comments
 (0)