Skip to content

Commit 03dde33

Browse files
author
jsf9k
committed
# Conflicts: # .github/dependabot.yml
2 parents e5534f2 + e940403 commit 03dde33

File tree

10 files changed

+255
-99
lines changed

10 files changed

+255
-99
lines changed

‎.github/CODEOWNERS‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
# These owners will be the default owners for everything in the
44
# repo. Unless a later match takes precedence, these owners will be
55
# requested for review when someone opens a pull request.
6-
* @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
6+
* @dav3r @felddy @jsf9k @mcdonnnj
77

88
# These folks own any files in the .github directory at the root of
99
# the repository and any of its subdirectories.
10-
/.github/ @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
10+
/.github/ @dav3r @felddy @jsf9k @mcdonnnj
1111

1212
# These folks own all linting configuration files.
13-
/.ansible-lint @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
14-
/.bandit.yml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
15-
/.flake8 @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
16-
/.isort.cfg @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
17-
/.mdl_config.yaml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
18-
/.pre-commit-config.yaml @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
19-
/.prettierignore @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
20-
/.yamllint @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
21-
/requirements.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
22-
/requirements-dev.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
23-
/requirements-test.txt @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
24-
/setup-env @dav3r @felddy @jasonodoom @jsf9k @mcdonnnj
13+
/.ansible-lint @dav3r @felddy @jsf9k @mcdonnnj
14+
/.bandit.yml @dav3r @felddy @jsf9k @mcdonnnj
15+
/.flake8 @dav3r @felddy @jsf9k @mcdonnnj
16+
/.isort.cfg @dav3r @felddy @jsf9k @mcdonnnj
17+
/.mdl_config.yaml @dav3r @felddy @jsf9k @mcdonnnj
18+
/.pre-commit-config.yaml @dav3r @felddy @jsf9k @mcdonnnj
19+
/.prettierignore @dav3r @felddy @jsf9k @mcdonnnj
20+
/.yamllint @dav3r @felddy @jsf9k @mcdonnnj
21+
/requirements.txt @dav3r @felddy @jsf9k @mcdonnnj
22+
/requirements-dev.txt @dav3r @felddy @jsf9k @mcdonnnj
23+
/requirements-test.txt @dav3r @felddy @jsf9k @mcdonnnj
24+
/setup-env @dav3r @felddy @jsf9k @mcdonnnj

‎.github/dependabot.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ updates:
1313
- dependency-name: actions/checkout
1414
- dependency-name: actions/setup-go
1515
- dependency-name: actions/setup-python
16+
- dependency-name: cisagov/setup-env-github-action
1617
- dependency-name: crazy-max/ghaction-dump-context
1718
- dependency-name: crazy-max/ghaction-github-labeler
1819
- dependency-name: crazy-max/ghaction-github-status
20+
- dependency-name: GitHubSecurityLab/actions-permissions
21+
- dependency-name: hashicorp/setup-packer
1922
- dependency-name: hashicorp/setup-terraform
2023
- dependency-name: mxschmitt/action-tmate
2124
- dependency-name: step-security/harden-runner
@@ -28,10 +31,19 @@ updates:
2831
interval: weekly
2932

3033
- directory: /
34+
<<<<<<< HEAD
3135
ignore:
3236
# Managed by cisagov/skeleton-ansible-role
3337
- dependency-name: ansible
3438
- dependency-name: ansible-core
39+
=======
40+
# ignore:
41+
# # Managed by cisagov/skeleton-ansible-role
42+
# - dependency-name: ansible
43+
# - dependency-name: ansible-core
44+
# - dependency-name: molecule
45+
# - dependency-name: pytest-testinfra
46+
>>>>>>> e940403688abc64b9455c3903285c42bb978cc35
3547
package-ecosystem: pip
3648
schedule:
3749
interval: weekly

‎.github/workflows/build.yml‎

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ defaults:
2020
shell: bash -Eueo pipefail -x {0}
2121

2222
env:
23-
CURL_CACHE_DIR: ~/.cache/curl
2423
PIP_CACHE_DIR: ~/.cache/pip
2524
PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit
2625
RUN_TMATE: ${{ secrets.RUN_TMATE }}
@@ -31,10 +30,18 @@ env:
3130
jobs:
3231
diagnostics:
3332
name: Run diagnostics
33+
# This job does not need any permissions
34+
permissions: {}
3435
runs-on: ubuntu-latest
3536
steps:
3637
# Note that a duplicate of this step must be added at the top of
3738
# each job.
39+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
40+
with:
41+
# Uses the organization variable unless overridden
42+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
43+
# Note that a duplicate of this step must be added at the top of
44+
# each job.
3845
- id: harden-runner
3946
name: Harden the runner
4047
uses: step-security/harden-runner@v2
@@ -49,8 +56,15 @@ jobs:
4956
lint:
5057
needs:
5158
- diagnostics
59+
permissions:
60+
# actions/checkout needs this to fetch code
61+
contents: read
5262
runs-on: ubuntu-latest
5363
steps:
64+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
65+
with:
66+
# Uses the organization variable unless overridden
67+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
5468
- id: harden-runner
5569
name: Harden the runner
5670
uses: step-security/harden-runner@v2
@@ -76,7 +90,7 @@ jobs:
7690
name: Lookup Go cache directory
7791
run: |
7892
echo "dir=$(go env GOCACHE)" >> $GITHUB_OUTPUT
79-
- uses: actions/cache@v3
93+
- uses: actions/cache@v4
8094
env:
8195
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
8296
py${{ steps.setup-python.outputs.python-version }}-\
@@ -97,25 +111,12 @@ jobs:
97111
path: |
98112
${{ env.PIP_CACHE_DIR }}
99113
${{ env.PRE_COMMIT_CACHE_DIR }}
100-
${{ env.CURL_CACHE_DIR }}
101114
${{ steps.go-cache.outputs.dir }}
102115
restore-keys: |
103116
${{ env.BASE_CACHE_KEY }}
104-
- name: Setup curl cache
105-
run: mkdir -p ${{ env.CURL_CACHE_DIR }}
106-
- name: Install Packer
107-
env:
108-
PACKER_VERSION: ${{ steps.setup-env.outputs.packer-version }}
109-
run: |
110-
PACKER_ZIP="packer_${PACKER_VERSION}_linux_amd64.zip"
111-
curl --output ${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}" \
112-
--time-cond ${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}" \
113-
--location \
114-
"https://releases.hashicorp.com/packer/${PACKER_VERSION}/${PACKER_ZIP}"
115-
sudo unzip -d /opt/packer \
116-
${{ env.CURL_CACHE_DIR }}/"${PACKER_ZIP}"
117-
sudo mv /usr/local/bin/packer /usr/local/bin/packer-default
118-
sudo ln -s /opt/packer/packer /usr/local/bin/packer
117+
- uses: hashicorp/setup-packer@v3
118+
with:
119+
version: ${{ steps.setup-env.outputs.packer-version }}
119120
- uses: hashicorp/setup-terraform@v3
120121
with:
121122
terraform_version: ${{ steps.setup-env.outputs.terraform-version }}
@@ -173,6 +174,9 @@ jobs:
173174
${{ matrix.platform }}-${{ matrix.architecture }}
174175
needs:
175176
- diagnostics
177+
permissions:
178+
# actions/checkout needs this to fetch code
179+
contents: read
176180
runs-on: ubuntu-latest
177181
strategy:
178182
fail-fast: false
@@ -188,13 +192,21 @@ jobs:
188192
- debian13-systemd
189193
- fedora39-systemd
190194
- fedora40-systemd
195+
- fedora41-systemd
191196
- kali-systemd
192197
- ubuntu-20-systemd
193198
- ubuntu-22-systemd
194199
- ubuntu-24-systemd
195200
scenario:
196201
- default
197202
steps:
203+
# With this task in place the GitHub runners run out of
204+
# resources and crash. See cisagov/skeleton-ansible-role#211
205+
# for more details.
206+
# - uses: GitHubSecurityLab/actions-permissions/monitor@v1
207+
# with:
208+
# # Uses the organization variable unless overridden
209+
# config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
198210
- id: harden-runner
199211
name: Harden the runner
200212
uses: step-security/harden-runner@v2
@@ -207,7 +219,7 @@ jobs:
207219
uses: actions/setup-python@v5
208220
with:
209221
python-version: ${{ steps.setup-env.outputs.python-version }}
210-
- uses: actions/cache@v3
222+
- uses: actions/cache@v4
211223
env:
212224
BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
213225
py${{ steps.setup-python.outputs.python-version }}-"

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,26 @@ on:
2525
jobs:
2626
diagnostics:
2727
name: Run diagnostics
28+
# This job does not need any permissions
29+
permissions: {}
2830
runs-on: ubuntu-latest
2931
steps:
3032
# Note that a duplicate of this step must be added at the top of
3133
# each job.
34+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
35+
with:
36+
# Uses the organization variable unless overridden
37+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
38+
# Note that a duplicate of this step must be added at the top of
39+
# each job.
3240
- id: harden-runner
3341
name: Harden the runner
3442
uses: step-security/harden-runner@v2
3543
with:
3644
egress-policy: audit
3745
- id: github-status
3846
name: Check GitHub status
39-
uses: crazy-max/ghaction-github-status@v3
47+
uses: crazy-max/ghaction-github-status@v4
4048
- id: dump-context
4149
name: Dump context
4250
uses: crazy-max/ghaction-dump-context@v2
@@ -46,6 +54,8 @@ jobs:
4654
- diagnostics
4755
runs-on: ubuntu-latest
4856
permissions:
57+
# actions/checkout needs this to fetch code
58+
contents: read
4959
# required for all workflows
5060
security-events: write
5161
strategy:
@@ -59,6 +69,10 @@ jobs:
5969
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
6070

6171
steps:
72+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
73+
with:
74+
# Uses the organization variable unless overridden
75+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
6276
- id: harden-runner
6377
name: Harden the runner
6478
uses: step-security/harden-runner@v2

‎.github/workflows/sync-labels.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,36 @@ name: sync-labels
44
on:
55
push:
66
paths:
7-
- '.github/labels.yml'
8-
- '.github/workflows/sync-labels.yml'
7+
- .github/labels.yml
8+
- .github/workflows/sync-labels.yml
9+
workflow_dispatch:
910

1011
permissions:
1112
contents: read
1213

1314
jobs:
1415
diagnostics:
1516
name: Run diagnostics
17+
# This job does not need any permissions
18+
permissions: {}
1619
runs-on: ubuntu-latest
1720
steps:
1821
# Note that a duplicate of this step must be added at the top of
1922
# each job.
23+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
24+
with:
25+
# Uses the organization variable unless overridden
26+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
27+
# Note that a duplicate of this step must be added at the top of
28+
# each job.
2029
- id: harden-runner
2130
name: Harden the runner
2231
uses: step-security/harden-runner@v2
2332
with:
2433
egress-policy: audit
2534
- id: github-status
2635
name: Check GitHub status
27-
uses: crazy-max/ghaction-github-status@v3
36+
uses: crazy-max/ghaction-github-status@v4
2837
- id: dump-context
2938
name: Dump context
3039
uses: crazy-max/ghaction-dump-context@v2
@@ -38,6 +47,10 @@ jobs:
3847
issues: write
3948
runs-on: ubuntu-latest
4049
steps:
50+
- uses: GitHubSecurityLab/actions-permissions/monitor@v1
51+
with:
52+
# Uses the organization variable unless overridden
53+
config: ${{ vars.ACTIONS_PERMISSIONS_CONFIG }}
4154
- id: harden-runner
4255
name: Harden the runner
4356
uses: step-security/harden-runner@v2

0 commit comments

Comments
 (0)