Skip to content

Commit

Permalink
Merge pull request #110 from gazebosim/merge_2_main_20230926
Browse files Browse the repository at this point in the history
Merge: 2 -> main
  • Loading branch information
iche033 authored Sep 26, 2023
2 parents 215e325 + 9965b68 commit 94faf1e
Show file tree
Hide file tree
Showing 15 changed files with 1,992 additions and 327 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
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 }}

51 changes: 31 additions & 20 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,35 +1,26 @@
load(
"//gz_bazel:build_defs.bzl",
"@gz//bazel/skylark:build_defs.bzl",
"GZ_FEATURES",
"GZ_VISIBILITY",
"generate_include_header",
"gz_config_header",
"gz_configure_header",
"gz_export_header",
"gz_include_header",
)

package(
default_visibility = GZ_VISIBILITY,
features = GZ_FEATURES,
)

licenses(["notice"])
licenses(["notice"]) # Apache-2.0

exports_files(["LICENSE"])

PROJECT_NAME = "gz-utils"

PROJECT_MAJOR = 2

PROJECT_MINOR = 0

PROJECT_PATCH = 0

gz_config_header(
gz_configure_header(
name = "config",
src = "include/gz/utils/config.hh.in",
cmakelists = ["CMakeLists.txt"],
project_name = PROJECT_NAME,
project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH),
package = "utils",
)

gz_export_header(
Expand All @@ -41,10 +32,10 @@ gz_export_header(

public_headers_no_gen = glob([
"include/gz/utils/*.hh",
"include/gz/utils/detail/*.hh"
"include/gz/utils/detail/*.hh",
])

generate_include_header(
gz_include_header(
name = "utilshh_genrule",
out = "include/gz/utils.hh",
hdrs = public_headers_no_gen + [
Expand All @@ -60,7 +51,8 @@ public_headers = public_headers_no_gen + [
]

cc_library(
name = "gz_utils",
name = "utils",
srcs = ["src/Environment.cc"],
hdrs = public_headers,
includes = ["include"],
)
Expand All @@ -75,7 +67,7 @@ cc_library(
"test/integration/implptr/implptr_test_classes.hh",
],
includes = ["test/integration/implptr"],
deps = ["gz_utils"],
deps = [":utils"],
)

cc_test(
Expand All @@ -85,6 +77,25 @@ cc_test(
":implptr_test_classes",
"@gtest",
"@gtest//:gtest_main",
]
],
)

cc_test(
name = "Environment_TEST",
srcs = ["src/Environment_TEST.cc"],
deps = [
":utils",
"@gtest",
"@gtest//:gtest_main",
],
)

cc_test(
name = "NeverDestroyed_TEST",
srcs = ["src/NeverDestroyed_TEST.cc"],
deps = [
":utils",
"@gtest",
"@gtest//:gtest_main",
],
)
178 changes: 0 additions & 178 deletions COPYING

This file was deleted.

31 changes: 30 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,36 @@

## Gazebo Utils 2.x

## Gazebo Utils 2.0.0 (20XX-XX-XX)
## Gazebo Utils 2.1.0 (2023-09-26)

1. Documentation fixes
* [Pull request #104](https://github.com/gazebosim/gz-utils/pull/104)
* [Pull request #103](https://github.com/gazebosim/gz-utils/pull/103)

1. Infrastructure
* [Pull request #102](https://github.com/gazebosim/gz-utils/pull/102)
* [Pull request #101](https://github.com/gazebosim/gz-utils/pull/101)
* [Pull request #85](https://github.com/gazebosim/gz-utils/pull/85)

1. Extra test macros for ARM32/ARM64
* [Pull request #99](https://github.com/gazebosim/gz-utils/pull/99)

1. Add a utility for spawning subprocesses
* [Pull request #98](https://github.com/gazebosim/gz-utils/pull/98)

1. Support for bazel in Garden
* [Pull request #95](https://github.com/gazebosim/gz-utils/pull/95)

1. Rename COPYING to LICENSE
* [Pull request #93](https://github.com/gazebosim/gz-utils/pull/93)

1. Add missing config.hh include to gz headers
* [Pull request #90](https://github.com/gazebosim/gz-utils/pull/90)

1. ign -> gz Migrate Ignition headers
* [Pull request #84](https://github.com/gazebosim/gz-utils/pull/84)

## Gazebo Utils 2.0.0 (2022-09-22)

1. Improve install instructions
* [Pull request #80](https://github.com/gazebosim/gz-utils/pull/80)
Expand Down
Loading

0 comments on commit 94faf1e

Please sign in to comment.