Merge branch '2.0-dev' into 2.0-dev-license-acknowledgement-should-be-unique

Author: jkowalleck

.github/workflows/build_1.x_docs.yml

@@ -6,6 +6,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   PYTHON_VERSION_DEFAULT: "3.10"
 

.github/workflows/bundle_2.0_schemas.yml

@@ -1,62 +1,68 @@
-name: Bundle CycloneDX 2.0 JSON Schemas
+name: Bundle CDX-2.0
 
 on:
   push:
     branches:
-      - 2.0-dev
-      - 2.0-dev-threatmodeling
+      - 'master'
+      - 'main'
+      - '2.0-dev'
     paths:
       - '.github/workflows/bundle_2.0_schemas.yml' # self
-      - 'schema/2.0/**/*.schema.json'
       - 'tools/src/main/js/bundler/**'
+      - 'schema/2.0/cyclonedx-2.0.schema.json'
+      - 'schema/2.0/**/*.schema.json'
   workflow_dispatch:  # Allows manual trigger
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token
 permissions: {}
 
 jobs:
   bundle-schemas:
+    name: Bundle Schemas
     runs-on: ubuntu-latest
-
+    timeout-minutes: 30
     permissions:
       contents: write  # Required to push changes
-
+    env:
+      MODEL_DIR: schema/2.0/model
+      SOURCE_FILE: schema/2.0/cyclonedx-2.0.schema.json
+      BUNDLED_FILE: schema/2.0/cyclonedx-2.0-bundled.schema.json
+      MINIFIED_FILE: schema/2.0/cyclonedx-2.0-bundled.min.schema.json
     steps:
       - name: Checkout repository
         # see https://github.com/actions/checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
-
       - name: Setup Node.js
         # see https://github.com/actions/setup-node
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
-          node-version: '20'
-
+          node-version: '24.x'
       - name: Install dependencies
         working-directory: tools/src/main/js/bundler
         run: npm install
-
       - name: Bundle schemas
-        working-directory: tools/src/main/js/bundler
-        run: >-
-          node bundle-schemas.js
-          ../../../../../schema/2.0/model
-          ../../../../../schema/2.0/cyclonedx-2.0.schema.json
-
+        run: |
+          set -eux
+          node tools/src/main/js/bundler/bundle-schemas.js \
+            "$MODEL_DIR" "$SOURCE_FILE"
       - name: Check for changes and commit
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          BUNDLED_FILE="schema/2.0/cyclonedx-2.0-bundled.schema.json"
-          MINIFIED_FILE="schema/2.0/cyclonedx-2.0-bundled.min.schema.json"
-          
+          set -eu
+
           # Add both files (works for both new and modified files)
           git add "$BUNDLED_FILE" "$MINIFIED_FILE"
-          
+
           # Check if there are staged changes
-          if git diff --staged --quiet; then
+          if git diff --staged --quiet
+          then
             echo "No changes to bundled schemas"
           else
             echo "Committing bundled schema changes"

.github/workflows/generate_algorithm_families.yml

@@ -7,6 +7,10 @@ on:
       - 'tools/src/main/python/algorithmFamilyGeneration.py'
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   generate-families:
     runs-on: ubuntu-latest
@@ -38,25 +42,25 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           BRANCH_NAME="update-algorithm-families"
-          
+
           # Configure Git
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
-          
+
           # Check for changes
           if git diff --quiet schema/cryptography-defs.schema.json; then
             echo "No changes to algorithm families"
             exit 0
           fi
-          
+
           # Create branch and commit
           git checkout -b "$BRANCH_NAME"
           git add schema/cryptography-defs.schema.json
           git commit -m "chore: update algorithm families [skip ci]"
-          
+
           # Push to the branch (use GH_TOKEN for authentication)
           git push -u "https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}.git" "$BRANCH_NAME" --force
-          
+
           # Create Pull Request using GitHub CLI (gh)
           gh pr create \
             --title "chore: update algorithm families" \