Skip to content

Commit 3260b69

Browse files
authored
Merge pull request #239 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents b2cc855 + 760c689 commit 3260b69

File tree

11 files changed

+217
-36
lines changed

11 files changed

+217
-36
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-ansible-role
2526
# - dependency-name: cisagov/action-disable-apparmor
2627
# - dependency-name: docker/setup-buildx-action
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: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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+
# Enable if Ansible playbooks are used in the repository.
12+
ansible:
13+
- changed-files:
14+
- any-glob-to-any-file:
15+
- defaults/**/*.yml
16+
- handlers/**/*.yml
17+
- meta/**/*.yml
18+
- tasks/**/*.yml
19+
- vars/**/*.yml
20+
dependencies:
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
# Add any dependency files used.
24+
- .pre-commit-config.yaml
25+
- meta/**/*.yml
26+
- requirements*.txt
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+
# Enable if Packer is used in the repository.
36+
# packer:
37+
# - changed-files:
38+
# - any-glob-to-any-file:
39+
# - "**/*.pkr.hcl"
40+
# Enable if Python is used in the repository.
41+
python:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- "**/*.py"
45+
# Enable if Terraform is used in the repository.
46+
# terraform:
47+
# - changed-files:
48+
# - any-glob-to-any-file:
49+
# - "**/*.tf"
50+
test:
51+
- changed-files:
52+
- any-glob-to-any-file:
53+
# Add any test-related files or paths.
54+
- .ansible-lint
55+
- .bandit.yml
56+
- .config/molecule/config.yml
57+
- .flake8
58+
- .isort.cfg
59+
- .mdl_config.yaml
60+
- .yamllint
61+
- molecule/**
62+
upstream update:
63+
- head-branch:
64+
# Any Lineage pull requests should use this branch.
65+
- lineage/skeleton
66+
version bump:
67+
- changed-files:
68+
- any-glob-to-any-file:
69+
# Ensure this matches your version tracking file(s).
70+
- version.txt

.github/labels.yml

Lines changed: 6 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
@@ -50,6 +53,9 @@
5053
- color: fcdb45
5154
description: This pull request is awaiting an action or decision to move forward
5255
name: on hold
56+
- color: 3772a4
57+
description: Pull requests that update Python code
58+
name: python
5359
- color: ef476c
5460
description: This issue is a request for information or needs discussion
5561
name: question

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@ 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
# We need the Go version and Go cache location for the actions/cache step,
109109
# so the Go installation must happen before that.
110110
- id: setup-go
111-
uses: actions/setup-go@v5
111+
uses: actions/setup-go@v6
112112
with:
113113
# There is no expectation for actual Go code so we disable caching as
114114
# it relies on the existence of a go.sum file.
@@ -257,10 +257,10 @@ jobs:
257257
# this workflow.
258258
permissions_monitoring_config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
259259
- id: setup-env
260-
uses: cisagov/setup-env-github-action@develop
261-
- uses: actions/checkout@v4
260+
uses: cisagov/setup-env-github-action@v1
261+
- uses: actions/checkout@v5
262262
- id: setup-python
263-
uses: actions/setup-python@v5
263+
uses: actions/setup-python@v6
264264
with:
265265
python-version: ${{ steps.setup-env.outputs.python-version }}
266266
- uses: actions/cache@v4

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