Merge pull request #15149 from totten/master-d8json

(dev/release#9) distmaker - Report on head for commit civicrm-drupal-8
civicrm · Aug 28, 2019 · b2988c5 · b2988c5
2 parents 31ca831 + 3476a08
commit b2988c5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,7 +25,8 @@ tests/phpunit/CiviTest/CiviSeleniumSettings.php
 tests/phpunit/CiviTest/civicrm.settings.php
 tools/stats/config.php
 authors.txt
-drupal/
+/drupal/
+/drupal-8/
 WordPress
 joomla
 packages/

diff --git a/distmaker/distmaker.conf.dist b/distmaker/distmaker.conf.dist
@@ -19,6 +19,7 @@ DM_REF_CORE=master
 DM_REF_BACKDROP=1.x-${DM_REF_CORE}
 DM_REF_DRUPAL=7.x-${DM_REF_CORE}
 DM_REF_DRUPAL6=6.x-${DM_REF_CORE}
+DM_REF_DRUPAL8=${DM_REF_CORE}
 DM_REF_JOOMLA=${DM_REF_CORE}
 DM_REF_WORDPRESS=${DM_REF_CORE}
 DM_REF_PACKAGES=${DM_REF_CORE}
diff --git a/distmaker/distmaker.sh b/distmaker/distmaker.sh
@@ -123,7 +123,7 @@ check_conf()
     echo "Current directory is : $THIS_DIR";
     exit 1
   else
-    export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES
+    export DM_SOURCEDIR DM_GENFILESDIR DM_TMPDIR DM_TARGETDIR DM_PHP DM_RSYNC DM_ZIP DM_VERSION DM_REF_CORE DM_REF_DRUPAL DM_REF_DRUPAL6 DM_REF_DRUPAL8 DM_REF_JOOMLA DM_REF_WORDPRESS DM_REF_PACKAGES
     if [ ! -d "$DM_SOURCEDIR" ]; then
       echo; echo "ERROR! " DM_SOURCEDIR "directory not found!"; echo "(if you get empty directory name, it might mean that one of necessary variables is not set)"; echo;
     fi
@@ -234,6 +234,9 @@ if [ -d "$DM_SOURCEDIR/drupal" ]; then
   dm_git_checkout "$DM_SOURCEDIR/drupal" "$DM_REF_DRUPAL"
   GENCODE_CMS=Drupal
 fi
+if [ -d "$DM_SOURCEDIR/drupal-8" ]; then
+  dm_git_checkout "$DM_SOURCEDIR/drupal-8" "$DM_REF_DRUPAL8"
+fi
 
 ## Get latest dependencies
 dm_generate_vendor "$DM_SOURCEDIR"

diff --git a/distmaker/dists/repo-report.sh b/distmaker/dists/repo-report.sh
@@ -21,6 +21,7 @@ env \
   DM_REF_BACKDROP="$DM_REF_BACKDROP" \
   DM_REF_DRUPAL6="$DM_REF_DRUPAL6" \
   DM_REF_DRUPAL="$DM_REF_DRUPAL" \
+  DM_REF_DRUPAL8="$DM_REF_DRUPAL8" \
   DM_REF_JOOMLA="$DM_REF_JOOMLA" \
   DM_REF_WORDPRESS="$DM_REF_WORDPRESS" \
   DM_REF_PACKAGES="$DM_REF_PACKAGES" \

diff --git a/distmaker/utils/repo-report.php b/distmaker/utils/repo-report.php
@@ -37,7 +37,7 @@ function repo($path, $branch) {
     'civicrm-core' => repo("$DM_SOURCEDIR", getenv('DM_REF_CORE')),
     'civicrm-drupal@6.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL6')),
     'civicrm-drupal@7.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL')),
-    //'civicrm-drupal@8.x' => repo("$DM_SOURCEDIR/drupal", getenv('DM_REF_DRUPAL8')),
+    'civicrm-drupal-8' => repo("$DM_SOURCEDIR/drupal-8", getenv('DM_REF_DRUPAL8')),
     'civicrm-joomla' => repo("$DM_SOURCEDIR/joomla", getenv('DM_REF_JOOMLA')),
     'civicrm-packages' => repo("$DM_SOURCEDIR/packages", getenv('DM_REF_PACKAGES')),
     'civicrm-wordpress' => repo("$DM_SOURCEDIR/WordPress", getenv('DM_REF_WORDPRESS')),