PCHR-4029: Update mininum CiviCRM version for CiviHR and set new defa…

…ult hr version Most of the time, when using buildkit, we actually build from staging, so I'm setting this as the new default value for hr-version
civicrm · Jul 25, 2018 · 059280a · 059280a
1 parent 279d0b1
commit 059280a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/config/hr17/download.sh b/app/config/hr17/download.sh
@@ -7,8 +7,8 @@
 git_cache_setup "https://github.com/compucorp/civihr.git" "$CACHE_DIR/compucorp/civihr.git"
 
 [ -z "$CMS_VERSION" ] && CMS_VERSION=7.x
-[ -z "$CIVI_VERSION" ] && CIVI_VERSION=4.4
-[ -z "$HR_VERSION" ] && HR_VERSION=master
+[ -z "$CIVI_VERSION" ] && CIVI_VERSION=5.3.1
+[ -z "$HR_VERSION" ] && HR_VERSION=staging
 
 MAKEFILE="${TMPDIR}/${SITE_TYPE}/${SITE_NAME}/${SITE_ID}.make"
 cvutil_makeparent "$MAKEFILE"

diff --git a/src/civibuild.aliases.sh b/src/civibuild.aliases.sh
@@ -78,7 +78,7 @@ function civibuild_alias_resolve() {
     hr14)        SITE_TYPE=hrdemo           ; CIVI_VERSION=4.5       ; CMS_TITLE="CiviHR 1.4 Demo"                   ; HR_VERSION=1.4        ;;
     hr15)        SITE_TYPE=hr15             ; CIVI_VERSION=4.5       ; CMS_TITLE="CiviHR 1.5 Demo"                   ; HR_VERSION=1.5        ;;
     hr16)        SITE_TYPE=hr16             ; CIVI_VERSION=4.7.9     ; CMS_TITLE="CiviHR 1.6 Demo"                   ; HR_VERSION=master     ; NO_SAMPLE_DATA=1       ;;
-    hr17)        SITE_TYPE=hr17             ; CIVI_VERSION=4.7.18    ; CMS_TITLE="CiviHR 1.7 Demo"                   ; HR_VERSION=master     ; NO_SAMPLE_DATA=1       ;;
+    hr17)        SITE_TYPE=hr17             ; CIVI_VERSION=5.3.1     ; CMS_TITLE="CiviHR 1.7 Demo"                   ; HR_VERSION=staging    ; NO_SAMPLE_DATA=1       ;;
     hrmaster)    SITE_TYPE=hr15             ; CIVI_VERSION=master    ; CMS_TITLE="CiviHR Sandbox"                    ; HR_VERSION=master     ;;
 
     bempty)      SITE_TYPE=backdrop-empty   ; CIVI_VERSION=none      ; CMS_TITLE="Backdrop Sandbox"                  ;;