Merge pull request #64 from vbakke/feat/meta-on-top

Preparing for major release

Author: vbakke

.github/workflows/main.yml

@@ -53,12 +53,11 @@ jobs:
           file: Dockerfile
           platforms: linux/amd64,linux/arm64
           tags: wurstbrot/dsomm-yaml-generation:${{ steps.get-version.outputs.version }},wurstbrot/dsomm-yaml-generation:latest
-      - name: Extract generated.yaml and activities.yaml
+      - name: Extract generated files from docker image
         run: |
           docker run -d --name=yaml --entrypoint="/bin/sleep" wurstbrot/dsomm-yaml-generation:${{ steps.get-version.outputs.version }} 60 
-          docker cp yaml:/var/www/html/src/assets/YAML/generated/generated.yaml src/assets/YAML/generated/generated.yaml # TODO: Remove
-          docker cp yaml:/var/www/html/src/assets/YAML/activities.yaml src/assets/YAML/activities.yaml
-          
+          docker cp yaml:/var/www/html/generated/model.yaml generated/model.yaml 
+          docker cp yaml:/var/www/html/generated/dependency-tree.md generated/dependency-tree.md           
       - name: Replace version placeholder in activities.yaml
         run: |
           sed -i "s/__VERSION_PLACEHOLDER__/${{ steps.get-version.outputs.version }}/g" src/assets/YAML/activities.yaml

.gitignore

@@ -44,10 +44,9 @@ testem.log
 Thumbs.db 
 /yaml-generation/vendor/
 
-/src/assets/YAML/teams.yaml
-/src/assets/YAML/meta.yaml
 
 # Generated
 /src/assets/YAML/generated/generated.yaml
-/src/assets/YAML/activities.yaml
-src/assets/YAML/generated/dependency-tree.md
+/generated/model.yaml
+dependency-tree.md
+url-test-results.txt

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.20.1](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.20.0...v1.20.1) (2025-11-24)
+
+
+### Bug Fixes
+
+* Sort activities by level, within each sub-dimension ([e2aeba7](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/commit/e2aeba77089d21f0e7c5ce5bf6612903efc1938f))
+
 # [1.20.0](https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/compare/v1.19.0...v1.20.0) (2025-11-18)
 
 

Dockerfile

@@ -10,8 +10,6 @@ RUN cd /var/www/html/yaml-generation && composer install \
 --prefer-dist
 
 RUN pecl channel-update pecl.php.net && pecl install yaml && docker-php-ext-enable yaml
-RUN curl https://raw.githubusercontent.com/devsecopsmaturitymodel/DevSecOps-MaturityModel/refs/heads/main/src/assets/YAML/meta.yaml -o /var/www/html/src/assets/YAML/meta.yaml
-RUN echo "test" ; cat /var/www/html/src/assets/YAML/meta.yaml 
 RUN cd /var/www/html && php yaml-generation/generateDimensions.php
 workdir /var/www/html
 CMD php yaml-generation/generateDimensions.php