Skip to content

Commit 1578bb2

Browse files
committed
Generate publisher automatically
1 parent 3ccbd86 commit 1578bb2

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

yaml-generation/generateDimensions.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ elif [ "$1" = "--test-urls" ]; then
2525

2626
else
2727
echo "Generating model.yaml..."
28-
MSYS_NO_PATHCONV=1 $DOCKER_CMD run -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php'
28+
MSYS_NO_PATHCONV=1 $DOCKER_CMD run -e USERNAME=${USER:-$USERNAME} -ti --rm --volume "${PWD}:/app" wurstbrot/dsomm-yaml-generation bash -c 'cd /app/ && php yaml-generation/generateDimensions.php'
2929
fi

yaml-generation/generateDimensions.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if "%~1"=="--start-dsomm" (
2727

2828
) else (
2929
echo Generate model.yaml...
30-
%DOCKER_CMD% run -e %argument% -ti --rm --volume "%CD%:/app" wurstbrot/dsomm-yaml-generation bash -c "cd /app/ && php yaml-generation/generateDimensions.php"
30+
%DOCKER_CMD% run -e USERNAME=%USERNAME% -ti --rm --volume "%CD%:/app" wurstbrot/dsomm-yaml-generation bash -c "cd /app/ && php yaml-generation/generateDimensions.php"
3131

3232
)
3333

yaml-generation/generateDimensions.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
$inputFolder = "src/assets/YAML";
88
$implementationReferenceFile = "$inputFolder/default/implementations.yaml";
99

10+
if (getenv('GITHUB_ACTIONS')) {
11+
$publisher = 'https://github.com/' . getenv('GITHUB_REPOSITORY');
12+
} else {
13+
$publisher = getenv('USERNAME');
14+
}
15+
1016
$files = glob("$inputFolder/default/*/*.yaml");
1117
$dimensions = array();
1218
foreach ($files as $filename) {
@@ -157,7 +163,6 @@
157163
}
158164

159165

160-
161166
// Post-process to add activity name as comment for `dependsOn`
162167
$dimensionsString = yaml_emit($dimensionsAggregated);
163168
preg_match_all('/\{!([0-9a-z-]{30,})!\}/', $dimensionsString, $matches);
@@ -173,7 +178,7 @@
173178
'meta' => array(
174179
'version' => '__VERSION_PLACEHOLDER__',
175180
'released' => date('Y-m-d'),
176-
'publisher' => 'https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/'
181+
'publisher' => $publisher
177182
)
178183
);
179184
$modelString = yaml_emit_with_header($metaDocument, $dimensionsAggregated);

0 commit comments

Comments
 (0)