Skip to content

Commit e89f149

Browse files
authored
Merge pull request #61 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 8b7ca98 + 954b431 commit e89f149

File tree

12 files changed

+245
-41
lines changed

12 files changed

+245
-41
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ updates:
1111
schedule:
1212
interval: weekly
1313

14+
- directory: /
15+
package-ecosystem: docker-compose
16+
schedule:
17+
interval: weekly
18+
1419
- directory: /
1520
ignore:
1621
# Managed by cisagov/skeleton-generic
1722
- dependency-name: actions/cache
1823
- dependency-name: actions/checkout
1924
- dependency-name: actions/dependency-review-action
25+
- dependency-name: actions/labeler
2026
- dependency-name: actions/setup-go
2127
- dependency-name: actions/setup-python
2228
- dependency-name: cisagov/action-job-preamble
@@ -36,6 +42,12 @@ updates:
3642
- dependency-name: docker/setup-buildx-action
3743
- dependency-name: docker/setup-qemu-action
3844
- dependency-name: peter-evans/dockerhub-description
45+
labels:
46+
# dependabot default we need to replicate
47+
- dependencies
48+
# This matches our label definition in .github/labels.yml as opposed to
49+
# dependabot's default of `github_actions`.
50+
- github-actions
3951
package-ecosystem: github-actions
4052
schedule:
4153
interval: weekly

.github/labeler.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
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+
- compose.yml
62+
- pytest.ini
63+
- tests/**
64+
typescript:
65+
- changed-files:
66+
- any-glob-to-any-file:
67+
- "**/*.ts"
68+
upstream update:
69+
- head-branch:
70+
# Any Lineage pull requests should use this branch.
71+
- lineage/skeleton
72+
version bump:
73+
- changed-files:
74+
- any-glob-to-any-file:
75+
# Ensure this matches your version tracking file(s).
76+
- src/version.txt

.github/labels.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
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
6+
description: Pull requests that update Ansible code
7+
name: ansible
58
- color: eb6420
69
description: This issue or pull request is awaiting the outcome of another issue or pull request
710
name: blocked
@@ -44,6 +47,9 @@
4447
- color: fef2c0
4548
description: This issue or pull request is not applicable, incorrect, or obsolete
4649
name: invalid
50+
- color: f1d642
51+
description: Pull requests that update JavaScript code
52+
name: javascript
4753
- color: ce099a
4854
description: This pull request is ready to merge during the next Lineage Kraken release
4955
name: kraken 🐙
@@ -53,15 +59,27 @@
5359
- color: fcdb45
5460
description: This pull request is awaiting an action or decision to move forward
5561
name: on hold
62+
- color: 02a8ef
63+
description: Pull requests that update Packer code
64+
name: packer
65+
- color: 3772a4
66+
description: Pull requests that update Python code
67+
name: python
5668
- color: ef476c
5769
description: This issue is a request for information or needs discussion
5870
name: question
5971
- color: d73a4a
6072
description: This issue or pull request addresses a security issue
6173
name: security
74+
- color: 7b42bc
75+
description: Pull requests that update Terraform code
76+
name: terraform
6277
- color: 00008b
6378
description: This issue or pull request adds or otherwise modifies test code
6479
name: test
80+
- color: 2b6ebf
81+
description: Pull requests that update TypeScript code
82+
name: typescript
6583
- color: 1d76db
6684
description: This issue or pull request pulls in upstream updates
6785
name: upstream update

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,16 @@ jobs:
119119
# this workflow.
120120
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
121121
- id: setup-env
122-
uses: cisagov/setup-env-github-action@develop
123-
- uses: actions/checkout@v4
122+
uses: cisagov/setup-env-github-action@v1
123+
- uses: actions/checkout@v5
124124
- id: setup-python
125-
uses: actions/setup-python@v5
125+
uses: actions/setup-python@v6
126126
with:
127127
python-version: ${{ steps.setup-env.outputs.python-version }}
128128
# We need the Go version and Go cache location for the actions/cache step,
129129
# so the Go installation must happen before that.
130130
- id: setup-go
131-
uses: actions/setup-go@v5
131+
uses: actions/setup-go@v6
132132
with:
133133
# There is no expectation for actual Go code so we disable caching as
134134
# it relies on the existence of a go.sum file.
@@ -264,7 +264,7 @@ jobs:
264264
# monitoring configuration *does not* require you to modify
265265
# this workflow.
266266
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
267-
- uses: actions/checkout@v4
267+
- uses: actions/checkout@v5
268268
- id: generate-metadata
269269
name: Generate Docker image metadata
270270
uses: docker/metadata-action@v5
@@ -407,7 +407,7 @@ jobs:
407407
- name: Load Docker image
408408
run: docker load < dist/image.tar.gz
409409
- name: Run Trivy vulnerability scanner
410-
uses: aquasecurity/[email protected].0
410+
uses: aquasecurity/[email protected].1
411411
with:
412412
image-ref: ${{ needs.repo-metadata.outputs.image-name }}:latest
413413
test:
@@ -448,10 +448,10 @@ jobs:
448448
# this workflow.
449449
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
450450
- id: setup-env
451-
uses: cisagov/setup-env-github-action@develop
452-
- uses: actions/checkout@v4
451+
uses: cisagov/setup-env-github-action@v1
452+
- uses: actions/checkout@v5
453453
- id: setup-python
454-
uses: actions/setup-python@v5
454+
uses: actions/setup-python@v6
455455
with:
456456
python-version: ${{ steps.setup-env.outputs.python-version }}
457457
- name: Cache testing environments

.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

.github/workflows/update-dockerhub-description.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ jobs:
9292
# this workflow.
9393
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
9494
- name: Checkout the repository
95-
uses: actions/checkout@v4
95+
uses: actions/checkout@v5
9696
- name: Update the Docker Hub description
97-
uses: peter-evans/dockerhub-description@v4
97+
uses: peter-evans/dockerhub-description@v5
9898
with:
9999
password: ${{ secrets.DOCKER_PASSWORD }}
100100
readme-filepath: README.md

0 commit comments

Comments
 (0)