Master branch updates (#187)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Mar 9, 2021 · 8fb1564 · 8fb1564
1 parent c9c4f80
commit 8fb1564
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 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
@@ -121,12 +121,12 @@ Please see
 # 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-gui/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-gui/blob/main/LICENSE) file.
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
@@ -46,7 +46,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
@@ -56,7 +56,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
@@ -68,7 +68,7 @@ pipelines:
           #   libogre-1.9-dev
           #   libogre-2.1-dev
           #   libglew-dev libfreeimage-dev freeglut3-dev libxmu-dev libxi-dev
-          # - git clone http://github.com/ignitionrobotics/ign-rendering -b master
+          # - git clone http://github.com/ignitionrobotics/ign-rendering
           # - cd ign-rendering
           # - mkdir build
           # - cd build

diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc
@@ -27,7 +27,7 @@
 using namespace ignition;
 
 // Helper functions copied from
-// https://github.com/ignitionrobotics/ign-common/raw/master/src/Filesystem_TEST.cc
+// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc
 
 #ifndef _WIN32
 #include <fcntl.h>  // NOLINT(build/include_order)

diff --git a/tutorials/01_install.md b/tutorials/01_install.md
@@ -73,7 +73,7 @@ Add OSRF packages:
 
 Clone source code:
   ```
-  # This checks out the `master` branch. You can append `-b ign-gui#` (replace # with a number) to checkout a specific version
+  # This checks out the default branch. You can append `-b ign-gui#` (replace # with a number) to checkout a specific version
   git clone http://github.com/ignitionrobotics/ign-gui
   ```
 

diff --git a/tutorials/05_style.md b/tutorials/05_style.md
@@ -12,7 +12,7 @@ but it is also possible to use others such as Default and Universal. This tutori
 focuses on customizing the Material style.
 
 The default style is hardcoded into the
-[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/master/include/ignition/gui/qtquickcontrols2.conf)
+[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf)
 file.
 
 There are a few ways to override the default style: