Skip to content

Commit 9877fd9

Browse files
jkowalleckjkowalleck
authored
Merge branch 'master' into feat/licenses/acknowledgement-should-be-unique
2 parents 3abdbbd + 3077216 commit 9877fd9

File tree

237 files changed

+15452
-2894
lines changed

Some content is hidden

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

237 files changed

+15452
-2894
lines changed

‎.github/ISSUE_TEMPLATE/1-feature.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
name: Feature request
3-
about: Request or propose a core enhancement or feature
3+
about: Request or propose a core enhancement or feature
44
title: "[FEATURE]: <your title here>"
55
labels: proposed core enhancement
66

77
---
88

9-
<!--
10-
THank you for taking the time to file a feature request or core enhancement proposal
9+
<!--
10+
Thank you for taking the time to file a feature request or core enhancement proposal.
1111
-->
1212

1313
## Describe the feature
@@ -18,7 +18,7 @@ Please include scopes and out-of-scopes.
1818

1919
## Possible solutions
2020

21-
Do you have asolution in mind> Please describe.
21+
Do you have a solution in mind? Please describe.
2222
What is to be considdered? Any draw-backs?
2323

2424
## Alternatives

‎.github/ISSUE_TEMPLATE/2-defect.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ labels: defect
66

77
---
88

9-
<!--
10-
THank you for taking the time to file a report.
9+
<!--
10+
Thank you for taking the time to file a report.
1111
-->
1212

1313
## Describe the defect

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ contact_links:
33
- name: Discussions
44
url: https://github.com/CycloneDX/specification/discussions
55
about: Please ask and answer questions here.
6-
- name: Community slack support channel
6+
- name: Community Slack support channel
77
url: https://cyclonedx.slack.com/archives/CVA0G10FN
8-
about: Community slack channel.
9-
- name: Community slack invite
8+
about: Community Slack channel.
9+
- name: Community Slack invite
1010
url: https://cyclonedx.org/slack/invite
11-
about: Community slack invite.
11+
about: Community Slack invite.

‎.github/workflows/build_docs.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
env:
1010
PYTHON_VERSION_DEFAULT: "3.10"
1111

12+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
13+
permissions: {}
14+
1215
jobs:
1316
docs_xml:
1417
runs-on: ubuntu-latest
@@ -18,10 +21,10 @@ jobs:
1821
steps:
1922
- name: Checkout
2023
# see https://github.com/actions/checkout
21-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2225
- name: Set up JDK
2326
# see https://github.com/actions/setup-java
24-
uses: actions/setup-java@v4
27+
uses: actions/setup-java@v5
2528
with:
2629
java-version: '21'
2730
distribution: 'zulu'
@@ -30,7 +33,7 @@ jobs:
3033
run: ./gen.sh
3134
- name: Archive Schema documentation
3235
# https://github.com/actions/upload-artifact
33-
uses: actions/upload-artifact@v4
36+
uses: actions/upload-artifact@v6
3437
with:
3538
name: XML-Schema-documentation
3639
path: docgen/xml/docs
@@ -43,18 +46,18 @@ jobs:
4346
steps:
4447
- name: Checkout
4548
# see https://github.com/actions/checkout
46-
uses: actions/checkout@v4
49+
uses: actions/checkout@v6
4750
- name: Setup Python Environment
4851
# see https://github.com/actions/setup-python
49-
uses: actions/setup-python@v5
52+
uses: actions/setup-python@v6
5053
with:
5154
python-version: ${{ env.PYTHON_VERSION_DEFAULT }}
5255
architecture: 'x64'
5356
- name: Generate Schema documentation
5457
run: ./gen.sh
5558
- name: Archive Schema documentation
5659
# https://github.com/actions/upload-artifact
57-
uses: actions/upload-artifact@v4
60+
uses: actions/upload-artifact@v6
5861
with:
5962
name: JSON-Schema-documentation
6063
path: docgen/json/docs
@@ -67,12 +70,12 @@ jobs:
6770
steps:
6871
- name: Checkout
6972
# see https://github.com/actions/checkout
70-
uses: actions/checkout@v4
73+
uses: actions/checkout@v6
7174
- name: Generate Schema documentation
7275
run: ./gen.sh
7376
- name: Archive Schema documentation
7477
# https://github.com/actions/upload-artifact
75-
uses: actions/upload-artifact@v4
78+
uses: actions/upload-artifact@v6
7679
with:
7780
name: PROTO-Schema-documentation
7881
path: docgen/proto/docs

‎.github/workflows/bundle_2.0_schemas.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Bundle CycloneDX 2.0 JSON Schemas
2+
3+
on:
4+
push:
5+
branches:
6+
- 2.0-dev
7+
- 2.0-dev-threatmodeling
8+
paths:
9+
- 'schema/2.0/**/*.schema.json'
10+
- 'tools/src/main/js/bundle-schemas.js'
11+
workflow_dispatch: # Allows manual trigger
12+
13+
jobs:
14+
bundle-schemas:
15+
runs-on: ubuntu-latest
16+
17+
permissions:
18+
contents: write # Required to push changes
19+
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v6
23+
with:
24+
token: ${{ secrets.GITHUB_TOKEN }}
25+
26+
- name: Setup Node.js
27+
uses: actions/setup-node@v6
28+
with:
29+
node-version: '20'
30+
31+
- name: Install dependencies
32+
working-directory: tools/src/main/js
33+
run: npm install
34+
35+
- name: Bundle schemas
36+
working-directory: tools/src/main/js
37+
run: |
38+
node bundle-schemas.js \
39+
../../../../schema/2.0/model \
40+
../../../../schema/2.0/cyclonedx-2.0.schema.json
41+
42+
- name: Check for changes and commit
43+
run: |
44+
BUNDLED_FILE="schema/2.0/cyclonedx-2.0-bundled.schema.json"
45+
46+
# Add the file (works for both new and modified files)
47+
git add "$BUNDLED_FILE"
48+
49+
# Check if there are staged changes
50+
if git diff --staged --quiet; then
51+
echo "No changes to bundled schema"
52+
else
53+
echo "Committing bundled schema changes"
54+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
55+
git config --local user.name "github-actions[bot]"
56+
git commit -m "chore: update bundled schema [skip ci]"
57+
git push
58+
fi

‎.github/workflows/generate_algorithm_families.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Generate Algorithm Families Enum
2+
3+
on:
4+
push:
5+
paths:
6+
- 'schema/cryptography-defs.json'
7+
- 'tools/src/main/python/algorithmFamilyGeneration.py'
8+
workflow_dispatch:
9+
10+
jobs:
11+
generate-families:
12+
runs-on: ubuntu-latest
13+
14+
permissions:
15+
contents: write
16+
pull-requests: write
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v6
21+
with:
22+
token: ${{ secrets.GITHUB_TOKEN }}
23+
persist-credentials: false
24+
25+
- name: Set up Python
26+
uses: actions/setup-python@v5
27+
with:
28+
python-version: '3.x'
29+
30+
- name: Run algorithm family generator
31+
working-directory: tools/src/main/python
32+
run: python3 algorithmFamilyGeneration.py
33+
34+
- name: Create Pull Request
35+
env:
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
run: |
38+
BRANCH_NAME="update-algorithm-families"
39+
40+
# Configure Git
41+
git config --local user.email "github-actions[bot]@users.noreply.github.com"
42+
git config --local user.name "github-actions[bot]"
43+
44+
# Check for changes
45+
if git diff --quiet schema/cryptography-defs.schema.json; then
46+
echo "No changes to algorithm families"
47+
exit 0
48+
fi
49+
50+
# Create branch and commit
51+
git checkout -b "$BRANCH_NAME"
52+
git add schema/cryptography-defs.schema.json
53+
git commit -m "chore: update algorithm families [skip ci]"
54+
55+
# Push to the branch (use GH_TOKEN for authentication)
56+
git push -u "https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git" "$BRANCH_NAME" --force
57+
58+
# Create Pull Request using GitHub CLI (gh)
59+
gh pr create \
60+
--title "chore: update algorithm families" \
61+
--body "This PR updates \`schema/cryptography-defs.schema.json\` with the latest algorithm families generated from \`schema/cryptography-defs.json\`." \
62+
--base "master" \
63+
--head "$BRANCH_NAME" || echo "Pull request already exists"

‎.github/workflows/test_java.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,19 @@ defaults:
1414
run:
1515
working-directory: tools
1616

17+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
18+
permissions: {}
19+
1720
jobs:
18-
test:
21+
test_java:
1922
runs-on: ubuntu-latest
2023
steps:
2124
- name: Checkout
2225
# see https://github.com/actions/checkout
23-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6
2427
- name: Set up JDK
2528
# see https://github.com/actions/setup-java
26-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
2730
with:
2831
java-version: '8'
2932
distribution: 'zulu'

‎.github/workflows/test_js.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,24 @@ defaults:
1616
run:
1717
working-directory: tools/src/test/js
1818

19+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
20+
permissions: {}
21+
1922
jobs:
20-
test:
23+
test_js:
2124
timeout-minutes: 30
2225
runs-on: ubuntu-latest
2326
steps:
2427
- name: Checkout
2528
# see https://github.com/actions/checkout
26-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
2730
- name: Setup Node.js
2831
# see https://github.com/actions/setup-node
29-
uses: actions/setup-node@v4
32+
uses: actions/setup-node@v6
3033
with:
31-
node-version: '20.x'
32-
- name: Install Depenencies
34+
node-version: '24.x'
35+
package-manager-cache: false
36+
- name: Install Dependencies
3337
run: npm install
3438
- name: Run test
3539
run: npm test

‎.github/workflows/test_php.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,22 @@ defaults:
1616
run:
1717
working-directory: tools/src/test/php
1818

19+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
20+
permissions: {}
21+
1922
jobs:
20-
test:
23+
test_php:
2124
timeout-minutes: 30
2225
runs-on: ubuntu-latest
2326
steps:
2427
- name: Checkout
2528
# see https://github.com/actions/checkout
26-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
2730
- name: Setup PHP
2831
# see https://github.com/shivammathur/setup-php
2932
uses: shivammathur/setup-php@v2
3033
with:
31-
php-version: "8.1"
34+
php-version: "8.4"
3235
tools: composer:v2
3336
- name: Install Depenencies
3437
run: composer install

‎.github/workflows/test_proto.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ defaults:
1616
run:
1717
working-directory: tools/src/test/proto
1818

19+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
20+
permissions: {}
21+
1922
jobs:
20-
test:
23+
test_proto:
2124
timeout-minutes: 30
2225
runs-on: ubuntu-latest
2326
steps:
2427
- name: Checkout
2528
# see https://github.com/actions/checkout
26-
uses: actions/checkout@v4
29+
uses: actions/checkout@v6
2730
- name: Run test
2831
run: ./test.sh

0 commit comments

Comments
 (0)