Create release branch for 5.12

Project-OSRM · Sep 5, 2017 · 838b2a7 · 838b2a7
1 parent c2dc7e9
commit 838b2a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,7 @@ branches:
     - master
     # enable building tags
     - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+    - 5.12
 
 cache:
   yarn: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
-# UNRELEASED
+# 5.12.0
+  - Changes from 5.11.0
     - Guidance
       - now announcing turning onto oneways at the end of a road (e.g. onto dual carriageways)
       - Adds new instruction types at the exit of roundabouts and rotaries `exit roundabout` and `exit rotary`.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "osrm",
-  "version": "5.12.0-roundaboutexits.1",
+  "version": "5.12.0-rc.1",
   "private": false,
   "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
   "dependencies": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ branches: @@
         - master
         # enable building tags
         - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+        - 5.12
     cache:
       yarn: true
@@ Expand Down @@