Skip to content

Commit 069eb25

Browse files
Merge branch 'main' into bug_cpe_purl_spdx_sbom
2 parents f8797ee + 7320f9a commit 069eb25

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

.github/actions/spelling/allow.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ ftp
221221
ftpd
222222
fuzzer
223223
g
224+
GAAD
224225
GAD
225226
gawk
226227
gcc
@@ -294,6 +295,7 @@ ikeydoherty
294295
img
295296
imgur
296297
imsahil
298+
inclusivity
297299
INI
298300
inosmeet
299301
iperf
@@ -760,6 +762,7 @@ webkitgtk
760762
webserver
761763
website
762764
websites
765+
WCAG
763766
wget
764767
whl
765768
wiki

.github/workflows/testing.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -209,21 +209,17 @@ jobs:
209209
python-version: '3.10'
210210
cache: 'pip'
211211

212-
# - name: "Skip tests if this is an automated sbom job"
213-
# env:
214-
# COMMIT_VAR: ${{ startsWith(github.head_ref, 'chore-sbom-py') && github.event.pull_request.user.login == 'github-actions[bot]' }}
215-
# run: |
216-
# if ${COMMIT_VAR} == true; then
217-
# echo "sbom=true" >> $GITHUB_ENV
218-
# echo "sbom set to true"
219-
# else
220-
# echo "sbom=false" >> $GITHUB_ENV
221-
# echo "sbom set to false"
222-
# fi
223-
#
224-
- name: "FIXME: Skip tests so we can break out of failure loop"
212+
- name: "Skip tests if this is an automated sbom job"
213+
env:
214+
COMMIT_VAR: ${{ startsWith(github.head_ref, 'chore-sbom-py') && github.event.pull_request.user.login == 'github-actions[bot]' }}
225215
run: |
216+
if ${COMMIT_VAR} == true; then
226217
echo "sbom=true" >> $GITHUB_ENV
218+
echo "sbom set to true"
219+
else
220+
echo "sbom=false" >> $GITHUB_ENV
221+
echo "sbom set to false"
222+
fi
227223
228224
- name: Get date
229225
id: get-date

0 commit comments

Comments
 (0)