.github/ci/packages.apt

@@ -1,6 +1,6 @@
-libignition-cmake2-dev
-libignition-math6-dev
-libignition-tools-dev
+libgz-cmake3-dev
+libgz-math7-dev
+libgz-tools2-dev
 libprotobuf-dev
 libprotoc-dev
 libtinyxml2-dev

.github/workflows/ci.yml

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

.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 }}

.github/workflows/triage.yml

@@ -10,10 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add ticket to inbox
-        uses: technote-space/create-project-card-action@v1
+        uses: actions/add-to-project@v0.5.0
         with:
-          PROJECT: Core development
-          COLUMN: Inbox
-          GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
-          CHECK_ORG_PROJECT: true
+          project-url: https://github.com/orgs/gazebosim/projects/7
+          github-token: ${{ secrets.TRIAGE_TOKEN }}
 

BUILD.bazel

@@ -1,89 +1,75 @@
 load(
-    "//ign_bazel:build_defs.bzl",
-    "IGNITION_ROOT",
-    "IGNITION_VISIBILITY",
-    "cmake_configure_file",
-    "generate_include_header",
-    "generate_yaml",
-    "ign_config_header",
-    "ign_export_header",
+    "@gz//bazel/skylark:build_defs.bzl",
+    "GZ_FEATURES",
+    "GZ_ROOT",
+    "GZ_VISIBILITY",
+    "gz_configure_header",
+    "gz_export_header",
+    "gz_include_header",
 )
 load(
-    ":ign_msg_gen.bzl",
+    "@gz//msgs/tools:gz_msgs_generate.bzl",
     "get_proto_headers",
-    "ign_msg_gen",
+    "gz_msgs_generate",
 )
 
 package(
-    default_visibility = IGNITION_VISIBILITY,
-    features = [
-        "-parse_headers",
-        "-layering_check",
-    ],
+    default_visibility = GZ_VISIBILITY,
+    features = GZ_FEATURES,
 )
 
-licenses(["notice"])
+licenses(["notice"])  # Apache-2.0
 
 exports_files(["LICENSE"])
 
-PROJECT_NAME = "ignition-msgs"
-
-PROJECT_MAJOR = 8
-
-PROJECT_MINOR = 0
-
-PROJECT_PATCH = 0
-
-# Generates config.hh based on the version numbers in CMake code.
-ign_config_header(
-    name = "config",
-    src = "include/ignition/msgs/config.hh.in",
+gz_configure_header(
+    name = "msgs_config_hh",
+    src = "include/gz/msgs/config.hh.in",
     cmakelists = ["CMakeLists.txt"],
-    project_name = PROJECT_NAME,
-    project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
+    package = "msgs",
 )
 
-ign_export_header(
-    name = "include/ignition/msgs/Export.hh",
-    export_base = "IGNITION_MSGS",
-    lib_name = "ignition-msgs",
+gz_export_header(
+    name = "include/gz/msgs/Export.hh",
+    export_base = "GZ_MSGS",
+    lib_name = "gz-msgs",
     visibility = ["//visibility:private"],
 )
 
 public_headers_no_gen = glob([
-    "include/ignition/msgs/*.hh",
-    "include/ignition/msgs/detail/*.hh",
+    "include/gz/msgs/*.hh",
+    "include/gz/msgs/detail/*.hh",
 ])
 
-protos = glob(["proto/ignition/msgs/*.proto"])
+protos = glob(["proto/gz/msgs/*.proto"])
 
-generate_include_header(
-    name = "messagetypeshh_genrule",
-    out = "include/ignition/msgs/MessageTypes.hh",
+gz_include_header(
+    name = "messagetypes_hh_genrule",
+    out = "include/gz/msgs/MessageTypes.hh",
     hdrs = get_proto_headers(protos),
-    strip_prefix = ["ign_msgs"],
+    strip_prefix = ["gz_msgs"],
 )
 
-generate_include_header(
-    name = "msghh_genrule",
-    out = "include/ignition/msgs.hh",
+gz_include_header(
+    name = "msgs_hh_genrule",
+    out = "include/gz/msgs.hh",
     hdrs = public_headers_no_gen + [
-        "include/ignition/msgs/config.hh",
-        "include/ignition/msgs/Export.hh",
-        "include/ignition/msgs/MessageTypes.hh",
+        "include/gz/msgs/config.hh",
+        "include/gz/msgs/Export.hh",
+        "include/gz/msgs/MessageTypes.hh",
     ],
 )
 
 public_headers = public_headers_no_gen + [
-    "include/ignition/msgs/config.hh",
-    "include/ignition/msgs/Export.hh",
-    "include/ignition/msgs/MessageTypes.hh",
-    "include/ignition/msgs.hh",
+    "include/gz/msgs/config.hh",
+    "include/gz/msgs/Export.hh",
+    "include/gz/msgs/MessageTypes.hh",
+    "include/gz/msgs.hh",
 ]
 
-# Custom Ignition Protoc plugin
+# Custom Gazebo Protoc plugin
 cc_binary(
-    name = "ign_msgs_gen",
+    name = "gz_msgs_gen",
     srcs = [
         "src/Generator.cc",
         "src/Generator.hh",
@@ -97,92 +83,58 @@ cc_binary(
 
 # Create a library of our protobuf message files
 proto_library(
-    name = "ignmsgs_proto",
-    srcs = protos,
-    strip_import_prefix = "proto",
-)
-
-# Create a library of our protobuf message files
-proto_library(
-    name = "ignmsgs_proto_public",
+    name = "gzmsgs_proto",
     srcs = protos,
     strip_import_prefix = "proto",
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
 )
 
-# Generate our custom CC files from the protos
-ign_msg_gen(
-    name = "ignmsgs_proto_cc",
-    deps = [":ignmsgs_proto"],
+gz_msgs_generate(
+    name = "gzmsgs_cc_proto",
+    deps = [
+        ":gzmsgs_proto",
+        "@com_google_protobuf//:any_proto",
+    ],
 )
 
 cc_library(
-    name = "ign_msgs",
+    name = "msgs",
     srcs = [
         "src/Factory.cc",
         "src/Filesystem.cc",
         "src/Utility.cc",
-        ":ignmsgs_proto_cc",
+        ":gzmsgs_cc_proto",
     ],
     hdrs = public_headers,
     includes = ["include"],
     deps = [
-        ":ignmsgs_proto_cc",
-        IGNITION_ROOT + "ign_math",
+        ":gzmsgs_cc_proto",
+        GZ_ROOT + "math",
         "@com_google_protobuf//:protobuf",
         "@tinyxml2",
     ],
 )
 
-# use shared library only when absolutely needd
-cc_binary(
-    name = "libignition-msgs.so",
-    srcs = [
-        "src/ign.cc",
-        "src/ign.hh",
-    ],
-    includes = ["include"],
-    linkshared = True,
-    linkstatic = True,
-    deps = [
-        ":ign_msgs",
-    ],
+test_sources = glob(
+    include = ["src/*_TEST.cc"],
+    exclude = [],
 )
 
 [cc_test(
     name = src.replace("/", "_").replace(".cc", "").replace("src_", ""),
     srcs = [src],
-    data = [IGNITION_ROOT + "ign_msgs/test:desc/stringmsg.desc"],
+    data = [
+        "test/desc",
+    ],
+    defines = [
+        'GZ_MSGS_TEST_PATH=\\"msgs/test\\"',
+    ],
     deps = [
-        ":ign_msgs",
-        IGNITION_ROOT + "ign_math",
-        IGNITION_ROOT + "ign_msgs/test:test_utils",
+        ":msgs",
+        GZ_ROOT + "common/testing",
         "@gtest",
         "@gtest//:gtest_main",
     ],
-) for src in glob(
-    [
-        "src/*_TEST.cc",
-    ],
-)]
-
-cmake_configure_file(
-    name = "msgs.rb",
-    src = "src/cmd/cmdmsgs.rb.in",
-    out = "cmdmsgs.rb",
-    cmakelists = ["CMakeLists.txt"],
-    defines = [
-        "library_location=libignition-msgs.so",
-        "PROJECT_VERSION_FULL=%d.%d.%d" % (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),  # noqa
-        "IGN_LIBRARY_NAME=%s" % [PROJECT_NAME],
-    ],
-)
-
-CMDS = "    - msg   : Print information about messages."
-
-generate_yaml(
-    name = "msgs",
-    commands = CMDS,
-    library_name = PROJECT_NAME,
-    library_version = "%d.%d.%d" % (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
-    ruby_target = "msgs.rb",
-)
+) for src in test_sources]