-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this necessary, with no more calls to rudder-templates-cli.jar after it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 |
3a64bf8
to
5fc2906
Compare
PR rebased |
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something has gone wrong here: there should be a line with "android::" just above this one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still missing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 |
2e661ef
to
66243fa
Compare
Commit modified |
66243fa
to
65a58c3
Compare
PR rebased |
65a58c3
to
4f22c37
Compare
Commit modified |
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