Skip to content

Commit

Permalink
5 ➡️ 6 (main) (#146)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Jan 25, 2022
2 parents 3318398 + 7278b56 commit 51cab20
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 156 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre1)
ign_configure_project(VERSION_SUFFIX)

#============================================================================
# Set project-specific options
Expand Down
28 changes: 27 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@

### Ignition Launch 5.X.X (20XX-XX-XX)

### Ignition Launch 5.0.0 (2021-09-XX)
### Ignition Launch 5.0.0 (2021-10-01)

1. Port ign-launch to Windows
* [Pull request #120](https:/ignitionrobotics/ign-launch/pull/120)

1. Add standalone executables
* [Pull request #121](https:/ignitionrobotics/ign-launch/pull/121)
* [Pull request #131](https:/ignitionrobotics/ign-launch/pull/131)

1. Remove unused includes (fix build)
* [Pull request #119](https:/ignitionrobotics/ign-launch/pull/119)
Expand All @@ -28,6 +29,10 @@

### Ignition Launch 4.X.X (20XX-XX-XX)

### Ignition Launch 4.1.0 (2021-10-14)

1. All changes included in Ignition Launch 3.4.2.

### Ignition Launch 4.0.0 (2021-03-30)

1. Bump in edifice: ign-common4
Expand All @@ -44,6 +49,10 @@

## Ignition Launch 3.x

### Ignition Launch 3.4.2 (2021-10-14)

1. All changes included in Ignition Launch 2.2.2.

### Ignition Launch 3.4.1 (2021-07-15)

1. Generate a better error websocket error code for `max_connections`.
Expand Down Expand Up @@ -108,6 +117,23 @@

## Ignition Launch 2.x

### Ignition Launch 2.2.2 (2021-10-11)

1. Master branch updates.
* [Pull request 98](https:/ignitionrobotics/ign-launch/pull/98)

1. Treat `IGN_LAUNCH_CONFIG_PATH` as a path list.
* [Pull request 93](https:/ignitionrobotics/ign-launch/pull/93)

1. Remove tools/code_check and update codecov.
* [Pull request 115](https:/ignitionrobotics/ign-launch/pull/115)

1. Update gtest for Windows compilation.
* [Pull request 122](https:/ignitionrobotics/ign-launch/pull/122)

1. Remove bitbucket-pipelines.yml.
* [Pull request 128](https:/ignitionrobotics/ign-launch/pull/128)

### Ignition Launch 2.2.1 (2021-01-08)

1. Fix env parsing by placing it before executable parsing.
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/main/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-main-bionic-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-main-bionic-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/ign_launch-ci-win/badge/icon)](https://build.osrfoundation.org/job/ign_launch-ci-win/)
Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/ign-launch5/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch5-bionic-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch5-bionic-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch5-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch5-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/job/ign_launch-ign-5-win/badge/icon)](https://build.osrfoundation.org/job/ign_launch-ign-5-win/)

Ignition Launch, a component of [Ignition
Robotics](https://ignitionrobotics.org), provides a command line interface
Expand Down
148 changes: 0 additions & 148 deletions bitbucket-pipelines.yml

This file was deleted.

2 changes: 0 additions & 2 deletions src/cmd/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ set(cmd_script_configured "${cmd_script_generated}.configured")
# within the install directory structure.
set(launch_exe_location "../../../${CMAKE_INSTALL_LIBDIR}/ignition/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}/$<TARGET_FILE_NAME:${launch_executable}>")

message("launch_exe_location " ${launch_exe_location})

configure_file(
"cmd${IGN_DESIGNATION}.rb.in"
"${cmd_script_configured}"
Expand Down

0 comments on commit 51cab20

Please sign in to comment.