From bb6a35744cec0b74152773981a056ff5bf26e518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20=C5=81ukawski?= Date: Thu, 10 Sep 2020 16:36:04 +0200 Subject: [PATCH] Embrace the Forking Git workflow https://github.com/roboticslab-uc3m/questions-and-answers/issues/88 --- .travis.yml | 6 +++--- CONTRIBUTING.md | 2 +- README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index dee916b5..2431007e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ env: global: - CACHE_DIR=~/cached-deps - YCM_CHECKOUT=ycm-0.11 - matrix: + jobs: - YARP_CHECKOUT=yarp-3.4 - YARP_CHECKOUT=yarp-3.3 -matrix: +jobs: include: - if: type = cron compiler: gcc @@ -60,7 +60,7 @@ install: source "$TRAVIS_BUILD_DIR/scripts/travis/git-cache-dependency.sh" --package-name COLOR_DEBUG --repo-url https://github.com/roboticslab-uc3m/color-debug - --repo-checkout develop + --repo-checkout master before_script: - mkdir -p "$TRAVIS_BUILD_DIR/build" && cd "$_" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95a3ede4..09a6cd40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,4 +7,4 @@ Before opening a fresh issue, do a search on [the wiki](http://robots.uc3m.es) a * Feel free to attach any other information illustrating the issue if copying and pasting text is not an option. Notes: -* We follow the [GitFlow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/) git workflow. +* We follow the [Forking](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow/) Git workflow. diff --git a/README.md b/README.md index 4a69cedd..67281e30 100644 --- a/README.md +++ b/README.md @@ -12,20 +12,20 @@ Installation instructions for installing from source can be found [here]( doc/vi #### Posting Issues -1. Read [CONTRIBUTING.md](https://github.com/roboticslab-uc3m/vision/blob/master/CONTRIBUTING.md) +1. Read [CONTRIBUTING.md](CONTRIBUTING.md) 2. [Post an issue / Feature request / Specific documentation request](https://github.com/roboticslab-uc3m/vision/issues) #### Fork & Pull Request 1. [Fork the repository](https://github.com/roboticslab-uc3m/vision/fork) -2. Create your feature branch (`git checkout -b my-new-feature`) off the `develop` branch, following the [GitFlow git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) +2. Create your feature branch (`git checkout -b my-new-feature`) off the `master` branch, following the [Forking Git workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow) 3. Commit your changes 4. Push to the branch (`git push origin my-new-feature`) 5. Create a new Pull Request ## Status -[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/vision.svg?branch=develop)](https://travis-ci.com/roboticslab-uc3m/vision) +[![Build Status (Linux)](https://travis-ci.com/roboticslab-uc3m/vision.svg?branch=master)](https://travis-ci.com/roboticslab-uc3m/vision) [![Coverage Status](https://coveralls.io/repos/roboticslab-uc3m/vision/badge.svg)](https://coveralls.io/r/roboticslab-uc3m/vision)