Master branch updates

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Mar 8, 2021 · 134a8da · 134a8da
1 parent c4433e7
commit 134a8da
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git 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
@@ -244,18 +244,17 @@ 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
 
 This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Ignition Robotics project](https://ignitionrobotics.org) which periodically releases a versioned set of compatible and complimentary libraries. See the [Ignition Robotics website](https://ignitionrobotics.org) for version and release information.
 
 # 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
@@ -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,15 +111,15 @@ 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
           - cmake .. -DBUILD_TESTING=false
           - 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
@@ -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
     {