Index: build/build.sh =================================================================== diff -u -r9d977c99d8d255400759d0590d6f0612e96c8c9f -r6448a0e3057e1dc02db2b699ce8ae2ea78e753a1 --- build/build.sh (.../build.sh) (revision 9d977c99d8d255400759d0590d6f0612e96c8c9f) +++ build/build.sh (.../build.sh) (revision 6448a0e3057e1dc02db2b699ce8ae2ea78e753a1) @@ -213,7 +213,32 @@ then hasTestPassed=false fi + cd .. + currentDir=$(pwd) + scripts/build/alarmMapping common/common/ application/sources/model/hd/alarm/ + cd application + # For good measures add email and user name all the time + git config --global user.email "dnavaei@diality.com" + git config --global user.name "Dara Navaei" + git add sources/model/hd/alarm/MAlarmMapping.cpp + git commit -m "Bamboo Commit: Updated MAlarmMapping.cpp" + #git push origin + + cd $currentDir + cp scripts/build/AlarmMapping.csv "$REMOTE_DIR" + + cd scripts/build + rm -rf Alarms.xlsx + cp -r /media/Denali06Alarms/Alarms.xlsx "$(pwd)" + + git commit -avm "Bamboo Commit: Copied Alarms table from Alarms folder" + git push + echo "Current Dir $(pwd)" + + python3 ./alarmMapping.py Alarms.xlsx ../../ui.config/Alarms/Alarms.conf + cd "$currentDir" + cd .. # Open up the status report and parse for the word Failed. This is @@ -316,31 +341,6 @@ #return back to main folder cd .. - currentDir=$(pwd) - scripts/build/alarmMapping common/common/ application/sources/model/hd/alarm/ - - cd application - # For good measures add email and user name all the time - git config --global user.email "dnavaei@diality.com" - git config --global user.name "Dara Navaei" - git add sources/model/hd/alarm/MAlarmMapping.cpp - git commit -m "Bamboo Commit: Updated MAlarmMapping.cpp" - git push origin - - cd $currentDir - cp scripts/build/AlarmMapping.csv "$REMOTE_DIR" - - cd scripts/build - rm -rf Alarms.xlsx - cp -r /media/Denali06Alarms/Alarms.xlsx "$(pwd)" - - git commit -avm "Bamboo Commit: Copied Alarms table from Alarms folder" - git push - echo "Current Dir $(pwd)" - - python3 ./alarmMapping.py Alarms.xlsx ../../ui.config/Alarms/Alarms.conf - cd "$currentDir" - ./scripts/build/create_update_folder.sh "$REMOTE_DIR" # Copy the build logs the remote address regardless of the build results