From daa8bd9a16a276721667bb3634e8e9ac558b4da8 Mon Sep 17 00:00:00 2001 From: Zoltan Feher Date: Fri, 13 May 2016 18:53:52 +0200 Subject: [PATCH 1/2] travis does not use --remote on git submodule update pull swiftmailer 5.x branch as submodule travis default submodule command disabled trying the force to update submodules --- .gitmodules | 1 + .travis.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitmodules b/.gitmodules index 6a26f6148..f9e1e7496 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "lib/vendor/swiftmailer"] path = lib/vendor/swiftmailer url = https://github.com/swiftmailer/swiftmailer.git + branch = 5.x [submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"] path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine url = https://github.com/LExpress/doctrine1.git diff --git a/.travis.yml b/.travis.yml index 1857ea28b..1fbcbbdd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,8 @@ install: - composer self-update before_script: + # by default, --remote is not used on travis + - git submodule update --remote --force - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;' - composer install From 8dfaeb24610e58477604d7d7b4991906455faeaf Mon Sep 17 00:00:00 2001 From: Zoltan Feher Date: Fri, 20 May 2016 23:34:18 +0200 Subject: [PATCH 2/2] submodule refs updated --- lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine | 2 +- lib/vendor/swiftmailer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine index 3d95c7f50..3835027a7 160000 --- a/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine +++ b/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine @@ -1 +1 @@ -Subproject commit 3d95c7f506e8b29d8e1fd48573dd0d046b9e6ae6 +Subproject commit 3835027a776677c2e057bafc27521640cb8114b9 diff --git a/lib/vendor/swiftmailer b/lib/vendor/swiftmailer index 0697e6aa6..1460e98b5 160000 --- a/lib/vendor/swiftmailer +++ b/lib/vendor/swiftmailer @@ -1 +1 @@ -Subproject commit 0697e6aa65c83edf97bb0f23d8763f94e3f11421 +Subproject commit 1460e98b53d2f916f1b4123069c96c90844a1a4d