Skip to content

Commit 00333a9

Browse files
Merge pull request #196 from aignostics/ketryx
feat(ketryx): integrate Ketryx compliance framework with requirements traceability
2 parents 869103e + 82fe669 commit 00333a9

File tree

98 files changed

+7061
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7061
-297
lines changed

.github/workflows/_ketryx_report_and_check.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77
description: 'Commit message to check for skip markers'
88
required: false
99
type: string
10+
11+
commit-sha:
12+
required: true
13+
type: string
1014
secrets:
1115
KETRYX_PROJECT:
1216
required: false
@@ -18,7 +22,6 @@ env:
1822
PYTHONIOENCODING: "utf8"
1923

2024
jobs:
21-
2225
ketryx_report_and_check:
2326
runs-on: ubuntu-latest
2427
permissions:
@@ -36,37 +39,36 @@ jobs:
3639
!contains(github.event.pull_request.labels.*.name, 'skip:ketryx')
3740
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
3841
with:
39-
name: test-results-ubuntu-latest
42+
name: test-results-ubuntu-latest
43+
path: test-results
4044

4145
- name: Download audit results generated in _audit.yml
4246
if: |
4347
!contains(inputs.commit_message, 'skip:ketryx') &&
4448
!contains(github.event.pull_request.labels.*.name, 'skip:ketryx')
4549
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
4650
with:
47-
name: audit-results
51+
name: audit-results
52+
path: audit-results
4853

4954
- name: Report build to Ketryx and check for approval
5055
if: |
5156
!contains(inputs.commit_message, 'skip:ketryx') &&
5257
!contains(github.event.pull_request.labels.*.name, 'skip:ketryx')
5358
uses: Ketryx/ketryx-github-action@40b13ef68c772e96e58ec01a81f5b216d7710186 # v1.4.0
54-
continue-on-error: true # TODO(Helmut): Remove post having Ketryx configured to inspect the main branch
5559
with:
5660
project: ${{ secrets.KETRYX_PROJECT }}
5761
api-key: ${{ secrets.KETRYX_API_KEY }}
62+
commit-sha: ${{ inputs.commit-sha }}
5863
build-name: "ci-cd"
59-
check-dependencies-status: true
60-
test-junit-path: reports/junit_*.xml
64+
test-junit-path: test-results/junit_*.xml
6165
cyclonedx-json-path: |
62-
reports/sbom.json
66+
audit-results/sbom.json
6367
artifact-path: |
64-
reports/sbom.spdx
65-
reports/licenses.csv
66-
reports/licenses.json
67-
reports/licenses_grouped.json
68-
reports/vulnerabilities.json
69-
reports/mypy_junit.xml
70-
reports/coverage.xml
71-
reports/coverage.md
72-
aignostics.log
68+
audit-results/sbom.spdx
69+
audit-results/licenses.csv
70+
audit-results/licenses.json
71+
audit-results/licenses_grouped.json
72+
audit-results/vulnerabilities.json
73+
test-results/coverage.xml
74+
test-results/coverage.md

.github/workflows/ci-cd.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
contents: read
7474
id-token: write
7575
packages: read
76-
76+
7777
test:
7878
needs: [get-commit-message]
7979
if: |
@@ -117,15 +117,16 @@ jobs:
117117
security-events: write
118118

119119
ketryx_report_and_check:
120-
needs: [get-commit-message, lint, audit, test, codeql]
121-
uses: ./.github/workflows/_ketryx_report_and_check.yml
120+
needs: [get-commit-message, lint, audit, test, codeql]
122121
if: |
123122
(!contains(needs.get-commit-message.outputs.commit_message, 'skip:ci')) &&
124123
(!contains(needs.get-commit-message.outputs.commit_message, 'build:native:only')) &&
125124
!(github.ref_type == 'branch' && startsWith(needs.get-commit-message.outputs.commit_message, 'Bump version:')) &&
126125
(!contains(github.event.pull_request.labels.*.name, 'skip:ci')) &&
127126
(!contains(github.event.pull_request.labels.*.name, 'build:native:only'))
127+
uses: ./.github/workflows/_ketryx_report_and_check.yml
128128
with:
129+
commit-sha: ${{ github.event.pull_request.head.sha || github.sha }}
129130
commit_message: ${{ needs.get-commit-message.outputs.commit_message }}
130131
permissions:
131132
attestations: write

0 commit comments

Comments
 (0)