From a291648b72b90a51513af9aff78b006f8a302d14 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 25 Apr 2017 11:16:10 -0400 Subject: [PATCH] more toggles Signed-off-by: Bill Erickson --- evergreen/eg-build.yml | 1 + opensrf/opensrf.yml | 1 + opensrf/websockets.yml | 1 + settings.yml | 5 +++++ 4 files changed, 8 insertions(+) diff --git a/evergreen/eg-build.yml b/evergreen/eg-build.yml index 33b48fdea..aea3378b3 100644 --- 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 3b031f138..451e4c2ea 100644 --- 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 dc9a094d6..82e978f32 100644 --- 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 13d7de96e..bf169220a 100644 --- 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 -- 2.11.0