Skip to content

Commit

Permalink
Adding autoStash true for pull --rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
rjshrjndrn committed Jan 21, 2020
1 parent 7e70db6 commit f31a42b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions apis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ medium=("english" "hindi" "malayalam")
gradeLevel=("class1" "class2" "class3")
subject=("maths" "english" "science")
source 3node.vars
default_users=("creator" "publisher" "reviewer")
learning_host="${kp_ip}:8080/learning-service"

#}}}
Expand Down
2 changes: 1 addition & 1 deletion deploy/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ ansible-playbook -i ../ansible/inventory/env ../ansible/deploy-plugins.yml -e"fo
module=KnowledgePlatform
source 3node.vars
# Checking out specific revision of KP
[[ -d ~/sunbird-learning-platform ]] || git clone https://github.com/project-sunbird/sunbird-learning-platform -b release-$version ~/sunbird-learning-platform && cd ~/sunbird-learning-platform; git pull --rebase origin release-$version; cd -
[[ -d ~/sunbird-learning-platform ]] || git clone https://github.com/project-sunbird/sunbird-learning-platform -b release-$version ~/sunbird-learning-platform && cd ~/sunbird-learning-platform; git config rebase.autoStash true; git pull --rebase origin release-$version; cd -

# Creating inventory strucure
cp $inventory_path/$module/* ../ansible/inventory/env/
Expand Down

0 comments on commit f31a42b

Please sign in to comment.