Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

plain run vars override vars from parameterized triggers

Browse Source
This commit is contained in:
Oliver Giles 2017-08-16 08:25:29 +03:00
parent 636dfb8651
commit 91baf358da
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/run.cpp
View File

@ -89,12 +89,17 @@ bool Run::step() {
chdir(currentScript.cwd.c_str()); chdir(currentScript.cwd.c_str());
// conf file env vars
for(std::string file : env) { for(std::string file : env) {
StringMap vars = parseConfFile(file.c_str()); StringMap vars = parseConfFile(file.c_str());
for(auto& it : vars) { for(auto& it : vars) {
setenv(it.first.c_str(), it.second.c_str(), true); setenv(it.first.c_str(), it.second.c_str(), true);
} }
} }
// parameterized vars
for(auto& pair : params) {
setenv(pair.first.c_str(), pair.second.c_str(), false);
}
setenv("PATH", PATH.c_str(), true); setenv("PATH", PATH.c_str(), true);
setenv("RUN", buildNum.c_str(), true); setenv("RUN", buildNum.c_str(), true);
@ -105,9 +110,7 @@ bool Run::step() {
setenv("LAST_RESULT", to_string(lastResult).c_str(), true); setenv("LAST_RESULT", to_string(lastResult).c_str(), true);
setenv("WORKSPACE", (fs::path(laminarHome)/"run"/name/"workspace").string().c_str(), true); setenv("WORKSPACE", (fs::path(laminarHome)/"run"/name/"workspace").string().c_str(), true);
setenv("ARCHIVE", (fs::path(laminarHome)/"archive"/name/buildNum.c_str()).string().c_str(), true); setenv("ARCHIVE", (fs::path(laminarHome)/"archive"/name/buildNum.c_str()).string().c_str(), true);
for(auto& pair : params) {
setenv(pair.first.c_str(), pair.second.c_str(), false);
}
fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.c_str()); fprintf(stderr, "[laminar] Executing %s\n", currentScript.path.c_str());
execl(currentScript.path.c_str(), currentScript.path.c_str(), NULL); execl(currentScript.path.c_str(), currentScript.path.c_str(), NULL);
// cannot use LLOG because stdout/stderr are captured // cannot use LLOG because stdout/stderr are captured