From 134a8dae2321920c7888e35d32977a956255c2c2 Mon Sep 17 00:00:00 2001
From: Louise Poubel <louise@openrobotics.org>
Date: Mon, 8 Mar 2021 15:20:04 -0800
Subject: [PATCH] Master branch updates

Signed-off-by: Louise Poubel <louise@openrobotics.org>
---
 .github/workflows/ci.yml                    |  2 +-
 README.md                                   |  7 +++----
 bitbucket-pipelines.yml                     | 14 +++++++-------
 plugins/websocket_server/WebsocketServer.hh |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7aa80d0b..705db4f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@master
+        uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
   focal-ci:
diff --git a/README.md b/README.md
index 442b65ea..e29f8ab5 100644
--- a/README.md
+++ b/README.md
@@ -244,13 +244,12 @@ ign-launch
 
 # Contributing
 
-Please see
-[CONTRIBUTING.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CONTRIBUTING.md).
+Please see the [contribution guide](https://ignitionrobotics.org/docs/all/contributing).
 
 # Code of Conduct
 
 Please see
-[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CODE_OF_CONDUCT.md).
+[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/main/CODE_OF_CONDUCT.md).
 
 # Versioning
 
@@ -258,4 +257,4 @@ This library uses [Semantic Versioning](https://semver.org/). Additionally, this
 
 # License
 
-This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-launch/blob/master/LICENSE) file.
+This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-launch/blob/main/LICENSE) file.
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index add1b65e..8a976b1b 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -44,7 +44,7 @@ pipelines:
           # # Ignition msgs (uncomment if a specific branch is needed)
           # - apt install -y
           #   libprotobuf-dev protobuf-compiler libprotoc-dev
-          # - git clone http://github.com/ignitionrobotics/ign-msgs -b master
+          # - git clone http://github.com/ignitionrobotics/ign-msgs
           # - cd ign-msgs
           # - mkdir build
           # - cd build
@@ -54,7 +54,7 @@ pipelines:
           # # Ignition transport (uncomment if a specific branch is needed)
           # - apt install -y
           #   libzmq3-dev uuid-dev libsqlite3-dev
-          # - git clone http://github.com/ignitionrobotics/ign-transport -b master
+          # - git clone http://github.com/ignitionrobotics/ign-transport
           # - cd ign-transport
           # - mkdir build
           # - cd build
@@ -65,7 +65,7 @@ pipelines:
           # - apt install -y
           #   libxml2-utils
           #   libtinyxml-dev
-          # - git clone http://github.com/osrf/sdformat -b master
+          # - git clone http://github.com/osrf/sdformat
           # - cd sdformat
           # - mkdir build
           # - cd build
@@ -75,7 +75,7 @@ pipelines:
           # # Ignition Rendering from source
           # - apt install -y
           #   libogre-1.9-dev libogre-2.1-dev libglew-dev libfreeimage-dev freeglut3-dev libxmu-dev libxi-dev uuid-dev xvfb
-          # - git clone https://github.com/ignitionrobotics/ign-rendering -b master
+          # - git clone https://github.com/ignitionrobotics/ign-rendering
           # - cd ign-rendering
           # - mkdir build
           # - cd build
@@ -97,7 +97,7 @@ pipelines:
           #   qml-module-qt-labs-folderlistmodel
           #   qml-module-qt-labs-settings
           #   qml-module-qtgraphicaleffects
-          # - git clone https://github.com/ignitionrobotics/ign-gui -b master
+          # - git clone https://github.com/ignitionrobotics/ign-gui
           # - cd ign-gui
           # - mkdir build
           # - cd build
@@ -111,7 +111,7 @@ pipelines:
             libdart6-dev
             libdart6-utils-urdf-dev
             libbenchmark-dev
-          - git clone https://github.com/ignitionrobotics/ign-physics -b master
+          - git clone https://github.com/ignitionrobotics/ign-physics
           - cd ign-physics
           - mkdir build
           - cd build
@@ -119,7 +119,7 @@ pipelines:
           - make install
           - cd ../..
           # Ignition Sensors from source
-          - git clone https://github.com/ignitionrobotics/ign-sensors -b master
+          - git clone https://github.com/ignitionrobotics/ign-sensors
           - cd ign-sensors
           - mkdir build
           - cd build
diff --git a/plugins/websocket_server/WebsocketServer.hh b/plugins/websocket_server/WebsocketServer.hh
index e95d2977..23bc50ea 100644
--- a/plugins/websocket_server/WebsocketServer.hh
+++ b/plugins/websocket_server/WebsocketServer.hh
@@ -130,7 +130,7 @@ namespace ignition
     ///
     /// `ign launch -v 4 websocket.ign`
     ///
-    /// 3. Open the [index.html](https://github.com/ignitionrobotics/ign-launch/blob/master/plugins/websocket_server/index.html) webpage.
+    /// 3. Open the [index.html](https://github.com/ignitionrobotics/ign-launch/blob/ign-launch2/plugins/websocket_server/index.html) webpage.
     ///
     class WebsocketServer : public ignition::launch::Plugin
     {