Skip to content

Commit b80ee64

Browse files
Update bundle_2.0_schemas.yml
Signed-off-by: Steve Springett <[email protected]>
1 parent 3b1bd41 commit b80ee64

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

.github/workflows/bundle_2.0_schemas.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,27 @@ jobs:
4242
- name: Check for changes
4343
id: git-check
4444
run: |
45-
# Check if bundled schema exists and has changes, or if it's new
46-
if [ ! -f schema/2.0/cyclonedx-2.0-bundled.schema.json ]; then
47-
echo "Bundled schema is new"
45+
BUNDLED_FILE="schema/2.0/cyclonedx-2.0-bundled.schema.json"
46+
47+
# Check if file is untracked (new)
48+
if ! git ls-files --error-unmatch "$BUNDLED_FILE" > /dev/null 2>&1; then
49+
echo "Bundled schema is new, adding to git"
50+
git add "$BUNDLED_FILE"
4851
echo "changed=true" >> $GITHUB_OUTPUT
49-
elif git diff --exit-code schema/2.0/cyclonedx-2.0-bundled.schema.json; then
50-
echo "No changes to bundled schema"
51-
echo "changed=false" >> $GITHUB_OUTPUT
52-
else
52+
# Check if tracked file has changes
53+
elif ! git diff --exit-code "$BUNDLED_FILE" > /dev/null 2>&1; then
5354
echo "Bundled schema has changes"
55+
git add "$BUNDLED_FILE"
5456
echo "changed=true" >> $GITHUB_OUTPUT
57+
else
58+
echo "No changes to bundled schema"
59+
echo "changed=false" >> $GITHUB_OUTPUT
5560
fi
5661
5762
- name: Commit and push changes
5863
if: steps.git-check.outputs.changed == 'true'
5964
run: |
6065
git config --local user.email "github-actions[bot]@users.noreply.github.com"
6166
git config --local user.name "github-actions[bot]"
62-
git add schema/2.0/cyclonedx-2.0-bundled.schema.json
6367
git commit -m "chore: update bundled schema [skip ci]"
6468
git push

0 commit comments

Comments
 (0)