From f3e1fe5db94d6f54b32cdcf05f4e21c6332d1f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=96?= Date: Wed, 24 Apr 2019 15:41:02 -0500 Subject: [PATCH] Fixed submodules not updating issue --- dev.sh | 1 + update.php | 1 - web/components | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev.sh b/dev.sh index 8c135d37..3099451c 100755 --- a/dev.sh +++ b/dev.sh @@ -19,4 +19,5 @@ $DIR/hooks/install.sh $PHPBIN composer.phar install git submodule update --init +git submodule update --recursive --remote $PHPBIN --server 0.0.0.0:8000 --docroot "$DIR/web" "$DIR/web/index.php" diff --git a/update.php b/update.php index 626d479e..3330100a 100755 --- a/update.php +++ b/update.php @@ -18,7 +18,6 @@ chdir(ROOT_DIR); Shell::exec('git fetch && git reset --hard origin/master'); Shell::exec('git submodule update --init'); -// Shell::exec('git pull --recurse-submodules'); Shell::exec('git submodule update --recursive --remote'); Shell::exec('php composer.phar install'); diff --git a/web/components b/web/components index fac5d5c4..a587adc1 160000 --- a/web/components +++ b/web/components @@ -1 +1 @@ -Subproject commit fac5d5c4461301bfbef4794e67123a050dd5d8fc +Subproject commit a587adc14942a9e1c90a84cfec99449086236c9e