From 143fee4367ea722eaee4149cea47ae81995c0c2a Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 18 Jan 2014 18:20:01 +0100
Subject: [PATCH 1/4] Update docs on git submodules
The docs currently do not reflect that:
* git submodules are init/updated automatically if there's a `.gitmodules` file
* the automatic integration can be turned off by setting `submodules: false`
---
user/build-configuration.md | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/user/build-configuration.md b/user/build-configuration.md
index d247ad3c7eb..84162a328ac 100644
--- a/user/build-configuration.md
+++ b/user/build-configuration.md
@@ -141,9 +141,18 @@ If your project has native dependencies (for example, libxml or libffi) or needs
you can install packages via apt and even use 3rd-party apt repositories and PPAs. For more see dedicated sections later in this guide.
-### Updating Git Submodules
+### Git Submodules
-If your project uses Git submodules, use the following technique to clone them before dependencies installation:
+Travis CI automatically initializes and updates submodules when a `.gitmodules` file is being found in the root directory.
+
+This can be turned off by setting:
+
+ git:
+ submodules: false
+
+If your project requires some specific option for your Git submodules which Travis CI does not support out of the box, then you can turn the automatic integration off and use the `before_install` hook to initializes and update them.
+
+E.g.:
before_install:
- git submodule update --init --recursive
From 72ab7bb561976637315d6a39f1e0aa0e5f4069a5 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 18 Jan 2014 18:56:27 +0100
Subject: [PATCH 2/4] Fix wording
---
user/build-configuration.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user/build-configuration.md b/user/build-configuration.md
index 84162a328ac..71d27772c1f 100644
--- a/user/build-configuration.md
+++ b/user/build-configuration.md
@@ -143,7 +143,7 @@ you can install packages via apt and even use 3rd-party apt repositories and PPA
### Git Submodules
-Travis CI automatically initializes and updates submodules when a `.gitmodules` file is being found in the root directory.
+Travis CI automatically initializes and updates submodules when a `.gitmodules` file is being found in the root of the repository.
This can be turned off by setting:
From 562ee0179f3a15b05d2c99b3db9e09bb5608705d Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 18 Jan 2014 20:01:41 +0100
Subject: [PATCH 3/4] Update build-configuration.md
---
user/build-configuration.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/user/build-configuration.md b/user/build-configuration.md
index 71d27772c1f..db63a85ffcc 100644
--- a/user/build-configuration.md
+++ b/user/build-configuration.md
@@ -143,7 +143,8 @@ you can install packages via apt and even use 3rd-party apt repositories and PPA
### Git Submodules
-Travis CI automatically initializes and updates submodules when a `.gitmodules` file is being found in the root of the repository.
+Travis CI automatically initializes and updates submodules when there's a `.gitmodules` file in the root of the repository.
+
This can be turned off by setting:
From 45da603a49d2329789f45f8b4246aa4fc6868ba7 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 18 Jan 2014 20:02:23 +0100
Subject: [PATCH 4/4] Update build-configuration.md
---
user/build-configuration.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user/build-configuration.md b/user/build-configuration.md
index db63a85ffcc..52fc0fef285 100644
--- a/user/build-configuration.md
+++ b/user/build-configuration.md
@@ -153,7 +153,7 @@ This can be turned off by setting:
If your project requires some specific option for your Git submodules which Travis CI does not support out of the box, then you can turn the automatic integration off and use the `before_install` hook to initializes and update them.
-E.g.:
+For example:
before_install:
- git submodule update --init --recursive