chore(travis): fix git-commit-msg extraction
[skip-ci]
This commit is contained in:
parent
fb3635a9ef
commit
d48ec2ddfa
3 changed files with 13 additions and 10 deletions
|
@ -63,11 +63,12 @@ after_script:
|
||||||
yes "C" | ctest -D ExperimentalMemCheck -VV;
|
yes "C" | ctest -D ExperimentalMemCheck -VV;
|
||||||
fi
|
fi
|
||||||
- if [[ $PUSH_TO_CDASH == TRUE ]]; then
|
- if [[ $PUSH_TO_CDASH == TRUE ]]; then
|
||||||
GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
|
GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`;
|
||||||
GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
|
GIT_SUBJECT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 2-`;
|
||||||
GIT_SUBJECT=${GIT_SUBJECT//\"/};
|
GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
|
||||||
|
GIT_SUBJECT=${GIT_SUBJECT//,/\,};
|
||||||
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
||||||
find Testing -name "*.xml" -exec sed -i "" "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
|
find Testing -name "*.xml" -exec sed -i "" "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
|
||||||
ctest -D ExperimentalSubmit;
|
ctest -D ExperimentalSubmit;
|
||||||
fi
|
fi
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|
|
@ -45,11 +45,12 @@ script:
|
||||||
- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
|
- sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE
|
||||||
- ctest -D ExperimentalBuild -VV
|
- ctest -D ExperimentalBuild -VV
|
||||||
- if [[ $PUSH_TO_CDASH == TRUE ]]; then
|
- if [[ $PUSH_TO_CDASH == TRUE ]]; then
|
||||||
GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
|
GIT_COMMIT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 1`;
|
||||||
GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
|
GIT_SUBJECT=`git log HEAD~ --oneline -n 1 | cut -d ' ' -f 2-`;
|
||||||
GIT_SUBJECT=${GIT_SUBJECT//\"/};
|
GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
|
||||||
|
GIT_SUBJECT=${GIT_SUBJECT//,/\,};
|
||||||
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
||||||
find Testing -name "*.xml" -exec sed -i "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
|
find Testing -name "*.xml" -exec sed -i "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
|
||||||
find Testing -type f -name "*.xml" -exec sed -i 's/OSName=\"Linux\"/OSName=\"Windows\"/' {} \; ;
|
find Testing -type f -name "*.xml" -exec sed -i 's/OSName=\"Linux\"/OSName=\"Windows\"/' {} \; ;
|
||||||
ctest -D ExperimentalSubmit;
|
ctest -D ExperimentalSubmit;
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -210,9 +210,10 @@ after_script:
|
||||||
- if [[ $LEANREPO == BLESSED && $PUSH_TO_CDASH == TRUE ]]; then
|
- if [[ $LEANREPO == BLESSED && $PUSH_TO_CDASH == TRUE ]]; then
|
||||||
GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
|
GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`;
|
||||||
GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
|
GIT_SUBJECT=`git log --oneline -n 1 | cut -d ' ' -f 2-`;
|
||||||
GIT_SUBJECT=${GIT_SUBJECT//\"/};
|
GIT_SUBJECT=${GIT_SUBJECT//\"/\\\"};
|
||||||
|
GIT_SUBJECT=${GIT_SUBJECT//,/\,};
|
||||||
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
GIT_SUBJECT=$(echo -e $(printf '%q' "$GIT_SUBJECT"));
|
||||||
find Testing -name "*.xml" -exec sed -i "s/Generator=\".*\"/Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"/" {} ";";
|
find Testing -name "*.xml" -exec sed -i "s,Generator=\".*\",Generator=\"${GIT_COMMIT}###${GIT_SUBJECT}\"," {} ";";
|
||||||
ctest -D ExperimentalSubmit;
|
ctest -D ExperimentalSubmit;
|
||||||
fi
|
fi
|
||||||
- cd ..
|
- cd ..
|
||||||
|
|
Loading…
Reference in a new issue