Skip to content

Commit

Permalink
update scripts and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
kinnou02 committed Mar 28, 2018
1 parent e427aea commit c84380a
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build_package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Build instructions
====================

1. Be sure you have runned the following command at the root of your tree :
``git submodule update --init``
``git submodule update --init --recursive``

2. Commit or stash all your changes
3. Tag the new release version
Expand Down
4 changes: 2 additions & 2 deletions documentation/vagrant/vagrant.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ url = https://github.com/CanalTP/navitia-proto.git
Update submodules:
```sh
cd navitia
git submodule update --init
git submodule update --init --recursive
```


Expand Down Expand Up @@ -352,7 +352,7 @@ pip install -r requirements.txt

# ! change .gitmodules url if using http instead of ssh !

git submodule update --init
git submodule update --init --recursive
./setup.py build_pbf
```

Expand Down
4 changes: 2 additions & 2 deletions install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ We hope you got the source code from git.

#. Get the submodules: at the root of project :

``git submodule update --init``
``git submodule update --init --recursive``

#. With CMake you can build in a repository different than the source directory.

Expand Down Expand Up @@ -143,4 +143,4 @@ Testing

#. Grab a browser and open http://localhost:5000/v1/coverage/default_region

#. Any trouble running Jormungandr see https://github.com/CanalTP/navitia/blob/dev/source/jormungandr/readme.md
#. Any trouble running Jormungandr see https://github.com/CanalTP/navitia/blob/dev/source/jormungandr/readme.md
2 changes: 1 addition & 1 deletion readme_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python ./script_release.py minor <canaltp_distant_repo_name>
```
Then follow the instructions given by the script, and also:
* pay attention to the changelog, remove useless PR (small doc) and check that every important PR is there
* don't forget to make `git submodule update` when necessary
* don't forget to make `git submodule update --recursive` when necessary
* check that `release` branch COMPILES and TESTS (unit, docker and tyr) before pushing it!

## Other releases
Expand Down
8 changes: 4 additions & 4 deletions script_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def __init__(self, release_type, remote_name="canalTP"):
print(is_release_unmerged.group(0))
print("ABORTING: {rem}/release branch was not merged in {rem}/dev".format(rem=remote_name))
print("This is required before releasing. You may use (be careful):")
print("git checkout dev; git submodule update")
print("git checkout dev; git submodule update --recursive")
print("git merge release")

exit(1)
Expand Down Expand Up @@ -142,7 +142,7 @@ def checkout_parent_branch(self):
parent = "release"

self.git.checkout(parent)
self.git.submodule('update')
self.git.submodule('update', '--recursive')

print("current branch {}".format(self.repo.active_branch))

Expand Down Expand Up @@ -293,7 +293,7 @@ def get_modified_changelog(self):

def publish_release(self, temp_branch):
self.git.checkout("release")
self.git.submodule('update')
self.git.submodule('update', '--recursive')
#merge with the release branch
self.git.merge(temp_branch, "release", '--no-ff')

Expand All @@ -315,7 +315,7 @@ def publish_release(self, temp_branch):
print("publishing the release")

print("Check the release, you will probably want to merge release in dev:")
print(" git checkout dev; git submodule update")
print(" git checkout dev; git submodule update --recursive")
print(" git merge release")
print("And when you're happy do:")
print(" git push {} release dev --tags".format(self.remote_name))
Expand Down

0 comments on commit c84380a

Please sign in to comment.