more toggles

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/evergreen/eg-build.yml b/evergreen/eg-build.yml
index 33b48fd..aea3378 100644 (file)
--- a/evergreen/eg-build.yml
+++ b/evergreen/eg-build.yml
@@ -4,6 +4,7 @@
     dest: "{{repo_base}}/Evergreen"
     depth: "{{eg_clone_depth}}"
     version: "{{eg_git_branch}}"
+    force: "{{force_git_checkout}}"
 - name: Install Evergreen Prereqs
   become: true
   shell: >

diff --git a/opensrf/opensrf.yml b/opensrf/opensrf.yml
index 3b031f1..451e4c2 100644 (file)
--- a/opensrf/opensrf.yml
+++ b/opensrf/opensrf.yml
@@ -4,6 +4,7 @@
     dest: "{{repo_base}}/OpenSRF"
     depth: "{{osrf_clone_depth}}"
     version: "{{osrf_git_branch}}"
+    force: "{{force_git_checkout}}"
 - name: Install OpenSRF Prereqs
   become: true
   shell: >

diff --git a/opensrf/websockets.yml b/opensrf/websockets.yml
index dc9a094..82e978f 100644 (file)
--- a/opensrf/websockets.yml
+++ b/opensrf/websockets.yml
@@ -2,6 +2,7 @@
   git:
     repo: "{{websockets_repository}}"
     dest: "/tmp/apache-websocket"
+    force: "{{force_git_checkout}}"
 - name: Install Websockets
   become: true
   shell: cd /tmp/apache-websocket && apxs2 -i -a -c mod_websocket.c 

diff --git a/settings.yml b/settings.yml
index 13d7de9..bf16922 100644 (file)
--- a/settings.yml
+++ b/settings.yml
@@ -8,6 +8,11 @@ eg_git_repository: git://git.evergreen-ils.org/Evergreen.git
 websockets_repository: https://github.com/disconnect/apache-websocket
 osrf_git_branch: master
 eg_git_branch: master
+
+# 'no'  == build will fail on local changes
+# 'yes' == local changes will be destroyed
+force_git_checkout: no
+
 # Clone depth "0" means full clone
 osrf_clone_depth: 0
 eg_clone_depth: 0