Fixes #8390: Merge remaining files from initial promises and system technique - bis #957
Conversation
| @@ -57,6 +59,7 @@ all: rudder-templates-cli.jar | |||
| java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/servers-by-role.st | |||
| java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/service-check.st | |||
| java -jar rudder-templates-cli.jar --outext .cf --outdir initial-promises/node-server/server-roles/1.0 techniques/system/server-roles/1.0/technique-reload.st | |||
| sed -i -e 's/.*TRACKINGKEY.*/ "TRACKINGKEY": "root-DP@@root-distributePolicy@@00",/' variables.json | |||
There was a problem hiding this comment.
Why is this necessary, with no more calls to rudder-templates-cli.jar after it?
There was a problem hiding this comment.
It's just handy.
When you run the makefile, variables.json stays the same, so I have no warning about a changed file anymore.
|
Commit modified |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
3a64bf8
to
5fc2906
Compare
|
PR rebased |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
5fc2906
to
2e661ef
Compare
| # The time at which the execution started | ||
| windows.!cygwin:: | ||
| "execRun" string => execresult("c:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command \"'{0:yyyy-MM-dd HH:mm:sszzz}' -f (get-date)\"", "noshell"); android:: | ||
| "execRun" string => execresult("/system/xbin/date \"+%Y-%m-%d %T+02:00\"", "noshell"); |
There was a problem hiding this comment.
Something has gone wrong here: there should be a line with "android::" just above this one.
There was a problem hiding this comment.
Oh, there is a BIG warning we should have on string template, it always removes the line after an &endif& !!!
|
Aside from those two comments this is looking great. |
|
PR rebased |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
2e661ef
to
66243fa
Compare
|
Commit modified |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
66243fa
to
65a58c3
Compare
|
PR rebased |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
65a58c3
to
4f22c37
Compare
|
Commit modified |
peckpeck
force-pushed
the
arch_8390/merge_remaining_files_from_initial_promises_and_system_technique_bis
branch
from
4f22c37
to
2d8bf14
Compare
|
That's kinda scary... could we add a test in scripts/check-techniques.sh to make sure all "&endif&" lines are followed by a blank line? |
|
OK, merging this PR |
https://www.rudder-project.org/redmine/issues/8390