Merge branch 'gz-common5' into ahcorde/3/coverage_loaders

.github/CODEOWNERS

@@ -2,4 +2,3 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
 *                     @mjcarroll
-tutorials/*           @maryaB-osr

.github/ci/packages.apt

@@ -1,13 +1,15 @@
+libassimp-dev
 libavcodec-dev
 libavdevice-dev
 libavformat-dev
 libavutil-dev
 libfreeimage-dev
+libgdal-dev
 libgts-dev
-libignition-cmake2-dev
-libignition-math6-dev
+libgz-cmake3-dev
+libgz-math7-dev
+libgz-utils2-dev
 libswscale-dev
 libtinyxml2-dev
 pkg-config
-ruby-ronn
 uuid-dev

.github/workflows/ci.yml

@@ -3,23 +3,23 @@ name: Ubuntu CI
 on: [push, pull_request]
 
 jobs:
-  bionic-ci:
+  focal-ci:
     runs-on: ubuntu-latest
-    name: Ubuntu Bionic CI
+    name: Ubuntu Focal CI
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@bionic
+        uses: gazebo-tooling/action-gz-ci@focal
         with:
           codecov-enabled: true
-  focal-ci:
+  jammy-ci:
     runs-on: ubuntu-latest
-    name: Ubuntu Focal CI
+    name: Ubuntu Jammy CI
     steps:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@focal
+        uses: gazebo-tooling/action-gz-ci@jammy

.github/workflows/macos.yml

@@ -0,0 +1,50 @@
+name: macOS latest
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    env:
+      PACKAGE: gz-common5
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Homebrew
+      id: set-up-homebrew
+      uses: Homebrew/actions/setup-homebrew@master
+    - run: brew config
+
+    - name: Install base dependencies
+      run: |
+        brew tap osrf/simulation;
+        # check for ci_matching_branch
+        brew install wget
+        wget https://github.com/gazebo-tooling/release-tools/raw/master/jenkins-scripts/tools/detect_ci_matching_branch.py
+        TRY_BRANCH="${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
+        if python3 detect_ci_matching_branch.py ${TRY_BRANCH}
+        then
+          echo "# BEGIN SECTION: trying to checkout branch ${TRY_BRANCH} from osrf/simulation"
+          pushd $(brew --repo osrf/simulation)
+          git fetch origin ${TRY_BRANCH} || true
+          git checkout ${TRY_BRANCH} || true
+          popd
+          echo '# END SECTION'
+        fi
+        # gz-math7 has problems with swig, remove it for now
+        brew remove swig || true
+        brew install --only-dependencies ${PACKAGE};
+    - run: mkdir build
+    - name: cmake
+      working-directory: build
+      run: cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/Cellar/${PACKAGE}/HEAD
+    - run: make
+      working-directory: build
+    - run: make test
+      working-directory: build
+      env:
+        CTEST_OUTPUT_ON_FAILURE: 1
+    - name: make install
+      working-directory: build
+      run: |
+        make install;
+        brew link ${PACKAGE};

.github/workflows/pr-collection-labeler.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - name: Add collection labels
       if: github.event.action == 'opened'
-      uses: ignition-tooling/pr-collection-labeler@v1
+      uses: gazebo-tooling/pr-collection-labeler@v1
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}

BUILD.bazel

@@ -1,103 +1,109 @@
 load(
-    "//ign_bazel:build_defs.bzl",
-    "IGNITION_FEATURES",
-    "IGNITION_ROOT",
-    "IGNITION_VISIBILITY",
+    "//gz_bazel:build_defs.bzl",
+    "GZ_FEATURES",
+    "GZ_ROOT",
+    "GZ_VISIBILITY",
     "generate_include_header",
-    "ign_config_header",
-    "ign_export_header",
+    "gz_config_header",
+    "gz_export_header",
 )
 
 package(
-    default_visibility = IGNITION_VISIBILITY,
-    features = IGNITION_FEATURES,
+    default_visibility = GZ_VISIBILITY,
+    features = GZ_FEATURES,
 )
 
 licenses(["notice"])
 
 exports_files(["LICENSE"])
 
-PROJECT_NAME = "ignition-common"
+PROJECT_NAME = "gz-common"
 
-PROJECT_MAJOR = 3
+PROJECT_MAJOR = 5
 
-PROJECT_MINOR = 14
+PROJECT_MINOR = 0
 
-PROJECT_PATCH =  0
+PROJECT_PATCH = 0
 
 # Generates config.hh based on the version numbers in CMake code.
-ign_config_header(
+gz_config_header(
     name = "config",
-    src = "include/ignition/common/config.hh.in",
+    src = "include/gz/common/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
     project_name = PROJECT_NAME,
     project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
 )
 
-ign_export_header(
-    name = "include/ignition/common/Export.hh",
-    export_base = "IGNITION_COMMON",
-    lib_name = "ignition-common",
+gz_export_header(
+    name = "include/gz/common/Export.hh",
+    export_base = "GZ_COMMON",
+    lib_name = "gz-common",
     visibility = ["//visibility:private"],
 )
 
 public_headers_no_gen = glob([
-    "include/ignition/common/*.hh",
-    "include/gz/common/detail/*.hh"
+    "include/gz/common/*.hh",
+    "include/gz/common/detail/*.hh",
 ])
 
 private_headers = [
     "src/PluginUtils.hh",
     "src/PrintWindowsSystemWarning.hh",
 ]
 
-sources = glob(["src/*.cc"], exclude=["src/*_TEST.cc"])
+sources = glob(
+    ["src/*.cc"],
+    exclude = ["src/*_TEST.cc"],
+)
 
 generate_include_header(
     name = "commonhh_genrule",
-    out = "include/ignition/common.hh",
+    out = "include/gz/common.hh",
     hdrs = public_headers_no_gen + [
-        "include/ignition/common/config.hh",
-        "include/ignition/common/Export.hh",
+        "include/gz/common/config.hh",
+        "include/gz/common/Export.hh",
     ],
 )
 
 public_headers = public_headers_no_gen + [
-    "include/ignition/common/config.hh",
-    "include/ignition/common/Export.hh",
-    "include/ignition/common.hh",
+    "include/gz/common/config.hh",
+    "include/gz/common/Export.hh",
+    "include/gz/common.hh",
 ]
 
 cc_library(
-    name = "ign_common",
+    name = "gz_common",
     srcs = sources + private_headers,
     hdrs = public_headers,
     includes = ["include"],
     linkopts = ["-ldl"],
     deps = [
         "@uuid",
-        IGNITION_ROOT + "ign_math",
+        GZ_ROOT + "gz_math",
     ],
 )
 
 cc_binary(
-    name = "libignition-common3.so",
+    name = "libgz-common5.so",
     includes = ["include"],
-    linkopts = ["-Wl,-soname,libignition-common3.so"],
+    linkopts = ["-Wl,-soname,libgz-common5.so"],
     linkshared = True,
-    deps = [":ign_common"],
+    deps = [":gz_common"],
 )
 
-test_srcs = glob(["src/*_TEST.cc"])
+test_srcs = glob(
+    ["src/*_TEST.cc"],
+    exclude = ["src/PluginLoader_TEST.cc"],
+)
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [":libignition-common3.so"],
+    data = [":libgz-common5.so"],
     deps = [
-        ":ign_common",
-        IGNITION_ROOT + "ign_bazel:utilities",
-        IGNITION_ROOT + "ign_common/test:test_utils",
+        ":gz_common",
+        GZ_ROOT + "gz_bazel:utilities",
+        GZ_ROOT + "gz_common/test:test_utils",
         "@gtest",
         "@gtest//:gtest_main",
     ],