Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump main to 12.0.0~pre1 #532

Merged
merged 2 commits into from
Apr 6, 2021
Merged

Bump main to 12.0.0~pre1 #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9971ff
🎈 11.0.0 (#529)
chapulina Mar 31, 2021
03d593e
Bump main to 12.0.0~pre1
chapulina Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:

env:
PACKAGE: sdformat11
PACKAGE: sdformat12
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ if(UNIX AND NOT WIN32)
endif(CMAKE_UNAME)
endif()

project (sdformat11)
project (sdformat12)

# The protocol version has nothing to do with the package version set below.
# It represents the current version of sdformat implement by the software
set (SDF_PROTOCOL_VERSION 1.8)

set (SDF_MAJOR_VERSION 11)
set (SDF_MAJOR_VERSION 12)
set (SDF_MINOR_VERSION 0)
set (SDF_PATCH_VERSION 0)

set (SDF_VERSION ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION})
set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre3)
set (SDF_VERSION_FULL ${SDF_MAJOR_VERSION}.${SDF_MINOR_VERSION}.${SDF_PATCH_VERSION}~pre1)

string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
string(REGEX REPLACE "[0-9]+" "" PROJECT_NAME_NO_VERSION ${PROJECT_NAME})
Expand Down
7 changes: 6 additions & 1 deletion Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
## libsdformat 12.X

### libsdformat 12.0.0 (202X-XX-XX)

## libsdformat 11.X

### libsdformat 11.X.X (202X-XX-XX)

### libsdformat 11.0.0 (202X-XX-XX)
### libsdformat 11.0.0 (2021-03-30)

1. Add ParserConfig class to encapsulate file path settings.
* [Pull request 439](https://github.com/osrf/sdformat/pull/439)
Expand Down Expand Up @@ -69,6 +73,7 @@
* [Pull request 275](https://github.com/osrf/sdformat/pull/275)
* [Pull request 250](https://github.com/osrf/sdformat/pull/250)
* [Pull request 243](https://github.com/osrf/sdformat/pull/243)
* [Pull request 524](https://github.com/osrf/sdformat/pull/524)

1. Implement SDFormat 1.8 Model Composition.
* [Pull request 426](https://github.com/osrf/sdformat/pull/426)
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ conda install libsdformat=9.3.0 --channel conda-forge
## Source Installation


**Note:** the `master` branch is under development for `libsdformat11` and is
currently unstable. A release branch (`sdf10`, `sdf9`, etc.) is recommended
for most users.
**Note:** the `main` branch is under development for `libsdformat12` and is
currently unstable. A release branch (`sdf11`, `sdf10`, `sdf9`, etc.) is
recommended for most users.

## UNIX

Expand Down
2 changes: 1 addition & 1 deletion examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

find_package(sdformat11 REQUIRED)
find_package(sdformat12 REQUIRED)

set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")

Expand Down