Skip to content

Commit 4e20a89

Browse files
authored
Merge pull request #30 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents e9ce979 + d8f3b8b commit 4e20a89

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

.github/workflows/build.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,21 +201,26 @@ jobs:
201201
uses: mxschmitt/action-tmate@v3
202202
if: env.RUN_TMATE
203203
test:
204-
name: test source - py${{ matrix.python-version }}
204+
name: test source - py${{ matrix.python-version }} - ${{ matrix.platform }}
205205
needs:
206206
- diagnostics
207207
permissions:
208208
# actions/checkout needs this to fetch code
209209
contents: read
210-
runs-on: ${{ matrix.os }}
210+
runs-on: ${{ matrix.platform }}
211211
strategy:
212212
fail-fast: false
213213
matrix:
214214
include:
215-
- os: ubuntu-22.04
215+
- platform: ubuntu-22.04
216216
python-version: "3.7"
217-
os:
217+
# We test on all of the latest platforms available to use with GitHub-
218+
# hosted runners for public repositories.
219+
platform:
220+
- macos-latest
221+
- ubuntu-24.04-arm
218222
- ubuntu-latest
223+
- windows-latest
219224
python-version:
220225
- "3.8"
221226
- "3.9"
@@ -257,7 +262,8 @@ jobs:
257262
python-version: ${{ matrix.python-version }}
258263
- uses: actions/cache@v4
259264
env:
260-
BASE_CACHE_KEY: ${{ github.job }}-${{ runner.os }}-\
265+
BASE_CACHE_KEY: ${{ github.job }}-\
266+
${{ runner.os }}-${{ runner.arch }}-\
261267
py${{ steps.setup-python.outputs.python-version }}-
262268
with:
263269
path: ${{ env.PIP_CACHE_DIR }}
@@ -416,22 +422,27 @@ jobs:
416422
uses: mxschmitt/action-tmate@v3
417423
if: env.RUN_TMATE
418424
test-build:
419-
name: test built wheel - py${{ matrix.python-version }}
425+
name: test built wheel - py${{ matrix.python-version }} - ${{ matrix.platform }}
420426
needs:
421427
- diagnostics
422428
- build
423429
permissions:
424430
# actions/checkout needs this to fetch code
425431
contents: read
426-
runs-on: ${{ matrix.os }}
432+
runs-on: ${{ matrix.platform }}
427433
strategy:
428434
fail-fast: false
429435
matrix:
430436
include:
431-
- os: ubuntu-22.04
437+
- platform: ubuntu-22.04
432438
python-version: "3.7"
433-
os:
439+
# We test on all of the latest platforms available to use with GitHub-
440+
# hosted runners for public repositories.
441+
platform:
442+
- macos-latest
443+
- ubuntu-24.04-arm
434444
- ubuntu-latest
445+
- windows-latest
435446
python-version:
436447
- "3.8"
437448
- "3.9"
@@ -473,7 +484,8 @@ jobs:
473484
python-version: ${{ matrix.python-version }}
474485
- uses: actions/cache@v4
475486
env:
476-
BASE_CACHE_KEY: ${{ github.job }}-${{ runner.os }}-\
487+
BASE_CACHE_KEY: ${{ github.job }}-\
488+
${{ runner.os }}-${{ runner.arch }}-\
477489
py${{ steps.setup-python.outputs.python-version }}-
478490
with:
479491
path: ${{ env.PIP_CACHE_DIR }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ repos:
182182

183183
# Ansible hooks
184184
- repo: https://github.com/ansible/ansible-lint
185-
rev: v25.1.3
185+
rev: v25.4.0
186186
hooks:
187187
- id: ansible-lint
188188
additional_dependencies:

0 commit comments

Comments
 (0)