Skip to content

Commit 901a6d3

Browse files
jsf9kjsf9k
authored
Merge pull request #262 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 5f95366 + d6e6f2c commit 901a6d3

File tree

13 files changed

+242
-38
lines changed

13 files changed

+242
-38
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ updates:
1212
- dependency-name: actions/cache
1313
- dependency-name: actions/checkout
1414
- dependency-name: actions/dependency-review-action
15+
- dependency-name: actions/labeler
1516
- dependency-name: actions/setup-go
1617
- dependency-name: actions/setup-python
1718
- dependency-name: cisagov/action-job-preamble
@@ -24,6 +25,12 @@ updates:
2425
# Managed by cisagov/skeleton-python-library
2526
- dependency-name: actions/download-artifact
2627
- dependency-name: actions/upload-artifact
28+
labels:
29+
# dependabot default we need to replicate
30+
- dependencies
31+
# This matches our label definition in .github/labels.yml as opposed to
32+
# dependabot's default of `github_actions`.
33+
- github-actions
2734
package-ecosystem: github-actions
2835
schedule:
2936
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+
- setup.py
22+
docker:
23+
- changed-files:
24+
- any-glob-to-any-file:
25+
- "**/compose*.yml"
26+
- "**/docker-compose*.yml"
27+
- "**/Dockerfile*"
28+
documentation:
29+
- changed-files:
30+
- any-glob-to-any-file:
31+
- "**/*.md"
32+
github-actions:
33+
- changed-files:
34+
- any-glob-to-any-file:
35+
- .github/workflows/**
36+
javascript:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- "**/*.js"
40+
packer:
41+
- changed-files:
42+
- any-glob-to-any-file:
43+
- "**/*.pkr.hcl"
44+
python:
45+
- changed-files:
46+
- any-glob-to-any-file:
47+
- "**/*.py"
48+
terraform:
49+
- changed-files:
50+
- any-glob-to-any-file:
51+
- "**/*.tf"
52+
test:
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
# Add any test-related files or paths.
56+
- .ansible-lint
57+
- .bandit.yml
58+
- .flake8
59+
- .isort.cfg
60+
- .mdl_config.yaml
61+
- .yamllint
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.py

‎.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
@@ -17,6 +20,9 @@
1720
- color: 0366d6
1821
description: Pull requests that update a dependency file
1922
name: dependencies
23+
- color: 2497ed
24+
description: Pull requests that update Docker code
25+
name: docker
2026
- color: 5319e7
2127
description: This issue or pull request improves or adds to documentation
2228
name: documentation
@@ -41,6 +47,9 @@
4147
- color: fef2c0
4248
description: This issue or pull request is not applicable, incorrect, or obsolete
4349
name: invalid
50+
- color: f1d642
51+
description: Pull requests that update JavaScript code
52+
name: javascript
4453
- color: ce099a
4554
description: This pull request is ready to merge during the next Lineage Kraken release
4655
name: kraken 🐙
@@ -50,6 +59,9 @@
5059
- color: fcdb45
5160
description: This pull request is awaiting an action or decision to move forward
5261
name: on hold
62+
- color: 02a8ef
63+
description: Pull requests that update Packer code
64+
name: packer
5365
- color: 3772a4
5466
description: Pull requests that update Python code
5567
name: python
@@ -59,9 +71,15 @@
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: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,18 @@ jobs:
9999
# this workflow.
100100
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
101101
- id: setup-env
102-
uses: cisagov/setup-env-github-action@develop
103-
- uses: actions/checkout@v4
102+
uses: cisagov/setup-env-github-action@v1
103+
- uses: actions/checkout@v5
104104
- id: setup-python
105-
uses: actions/setup-python@v5
105+
uses: actions/setup-python@v6
106106
with:
107107
# python-version: ${{ steps.setup-env.outputs.python-version }}
108108
# This project cannot currently support Python 3.11 or 3.12.
109109
python-version: "3.10"
110110
# We need the Go version and Go cache location for the actions/cache step,
111111
# so the Go installation must happen before that.
112112
- id: setup-go
113-
uses: actions/setup-go@v5
113+
uses: actions/setup-go@v6
114114
with:
115115
# There is no expectation for actual Go code so we disable caching as
116116
# it relies on the existence of a go.sum file.
@@ -234,6 +234,7 @@ jobs:
234234
# - "3.11"
235235
# - "3.12"
236236
# - "3.13"
237+
# - "3.14"
237238
steps:
238239
- name: Apply standard cisagov job preamble
239240
uses: cisagov/action-job-preamble@v1
@@ -261,9 +262,9 @@ jobs:
261262
# monitoring configuration *does not* require you to modify
262263
# this workflow.
263264
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
264-
- uses: actions/checkout@v4
265+
- uses: actions/checkout@v5
265266
- id: setup-python
266-
uses: actions/setup-python@v5
267+
uses: actions/setup-python@v6
267268
with:
268269
python-version: ${{ matrix.python-version }}
269270
- uses: actions/cache@v4
@@ -293,7 +294,7 @@ jobs:
293294
- name: Upload coverage report
294295
uses: coverallsapp/github-action@v2
295296
with:
296-
flag-name: py${{ matrix.python-version }}
297+
flag-name: py${{ matrix.python-version }} - ${{ matrix.platform }}
297298
parallel: true
298299
if: success()
299300
- name: Setup tmate debug session
@@ -334,7 +335,7 @@ jobs:
334335
# monitoring configuration *does not* require you to modify
335336
# this workflow.
336337
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
337-
- uses: actions/checkout@v4
338+
- uses: actions/checkout@v5
338339
- name: Finished coveralls reports
339340
uses: coverallsapp/github-action@v2
340341
with:
@@ -367,6 +368,7 @@ jobs:
367368
# - "3.11"
368369
# - "3.12"
369370
# - "3.13"
371+
# - "3.14"
370372
steps:
371373
- name: Apply standard cisagov job preamble
372374
uses: cisagov/action-job-preamble@v1
@@ -394,9 +396,9 @@ jobs:
394396
# monitoring configuration *does not* require you to modify
395397
# this workflow.
396398
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
397-
- uses: actions/checkout@v4
399+
- uses: actions/checkout@v5
398400
- id: setup-python
399-
uses: actions/setup-python@v5
401+
uses: actions/setup-python@v6
400402
with:
401403
python-version: ${{ matrix.python-version }}
402404
- uses: actions/cache@v4
@@ -460,6 +462,7 @@ jobs:
460462
# - "3.11"
461463
# - "3.12"
462464
# - "3.13"
465+
# - "3.14"
463466
steps:
464467
- name: Apply standard cisagov job preamble
465468
uses: cisagov/action-job-preamble@v1
@@ -487,9 +490,9 @@ jobs:
487490
# monitoring configuration *does not* require you to modify
488491
# this workflow.
489492
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
490-
- uses: actions/checkout@v4
493+
- uses: actions/checkout@v5
491494
- id: setup-python
492-
uses: actions/setup-python@v5
495+
uses: actions/setup-python@v6
493496
with:
494497
python-version: ${{ matrix.python-version }}
495498
- uses: actions/cache@v4
@@ -508,7 +511,7 @@ jobs:
508511
restore-keys: |
509512
${{ env.BASE_CACHE_KEY }}
510513
- name: Retrieve the built wheel
511-
uses: actions/download-artifact@v4
514+
uses: actions/download-artifact@v5
512515
with:
513516
name: dist-${{ matrix.python-version }}
514517
path: dist

‎.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

0 commit comments

Comments
 (0)