diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca539218..d8baec81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,25 +3,16 @@ name: Ubuntu CI on: [push, pull_request] jobs: - focal-ci: + jammy-ci: runs-on: ubuntu-latest - name: Ubuntu Focal CI + name: Ubuntu Jammy CI steps: - name: Checkout uses: actions/checkout@v3 - name: Compile and test id: ci - uses: gazebo-tooling/action-gz-ci@focal + uses: gazebo-tooling/action-gz-ci@jammy with: codecov-enabled: true cppcheck-enabled: true cpplint-enabled: true - jammy-ci: - runs-on: ubuntu-latest - name: Ubuntu Jammy CI - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Compile and test - id: ci - uses: gazebo-tooling/action-gz-ci@jammy diff --git a/CMakeLists.txt b/CMakeLists.txt index f12380ee..838ea6ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -gz_configure_project(VERSION_SUFFIX pre1) +gz_configure_project(VERSION_SUFFIX) #============================================================================ # Set project-specific options diff --git a/Changelog.md b/Changelog.md index 21e4cddf..ee547bc9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,9 +1,52 @@ ## Gazebo Launch 7.x -### Gazebo Launch 7.X.X (202X-XX-XX) +### Gazebo Launch 7.0.0 (2023-09-29) + +1. Documentation fixes + * [Pull request #230](https://github.com/gazebosim/gz-launch/pull/230) + +1. Infrastructure + * [Pull request #229](https://github.com/gazebosim/gz-launch/pull/229) + +1. ign -> gz + * [Pull request #223](https://github.com/gazebosim/gz-launch/pull/223) + +1. Bump Harmonic dependencies: fuel-tools, gui, physics, rendering, sdformat , sensors, sim, transport, and msgs + * [Pull request #210](https://github.com/gazebosim/gz-launch/pull/210) + * [Pull request #224](https://github.com/gazebosim/gz-launch/pull/224) + * [Pull request #207](https://github.com/gazebosim/gz-launch/pull/207) + +1. ⬆️ Bump main to 7.0.0~pre1 + * [Pull request #189](https://github.com/gazebosim/gz-launch/pull/189) ## Gazebo Launch 6.x +### Gazebo Launch 6.1.0 (2023-09-26) + +1. Infrastructure + * [Pull request #227](https://github.com/gazebosim/gz-launch/pull/227) + * [Pull request #226](https://github.com/gazebosim/gz-launch/pull/226) + * [Pull request #213](https://github.com/gazebosim/gz-launch/pull/213) + +1. Rename COPYING to LICENSE + * [Pull request #212](https://github.com/gazebosim/gz-launch/pull/212) + +1. Small cleanup fixes + * [Pull request #211](https://github.com/gazebosim/gz-launch/pull/211) + +1. Add pause and stop to Websocket Server + * [Pull request #187](https://github.com/gazebosim/gz-launch/pull/187) + +1. Fix gz_test when using a CMake generator different from make + * [Pull request #204](https://github.com/gazebosim/gz-launch/pull/204) + * [Pull request #205](https://github.com/gazebosim/gz-launch/pull/205) + +1. Return a message on asset error + * [Pull request #197](https://github.com/gazebosim/gz-launch/pull/197) + +1. Remove redundant namespace references + * [Pull request #190](https://github.com/gazebosim/gz-launch/pull/190) + ### Gazebo Launch 6.0.0 1. Fix macOs compiler error. diff --git a/README.md b/README.md index 71b0ab40..bf2d5382 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ directory. # Install -See the [installation tutorial](https://gazebosim.org/api/launch/5.0/install.html). +See the [installation tutorial](https://gazebosim.org/api/launch/7/install.html). # Usage @@ -99,7 +99,7 @@ This issue is tracked [here](https://github.com/gazebosim/gz-tools/issues/8). # Documentation -See the [installation tutorial](https://gazebosim.org/api/launch/5.0/install.html). +See the [installation tutorial](https://gazebosim.org/api/launch/7/install.html). # Folder Structure diff --git a/tutorials/install.md b/tutorials/install.md index a785f33e..9d4cec2a 100644 --- a/tutorials/install.md +++ b/tutorials/install.md @@ -3,7 +3,7 @@ # Install These instructions are for installing only Gazebo Launch. If you're interested -in using all the Gazebo libraries, not only Igniton Launch, check out this +in using all the Gazebo libraries, not only Gazebo Launch, check out this [Gazebo installation](https://gazebosim.org/docs/latest/install). We recommend following the binary install instructions to get up and running as @@ -27,7 +27,7 @@ On Ubuntu systems, `apt` can be used to install `gz-launch`: sudo apt install libgz-launch<#> ``` -Be sure to replace `<#>` with a number value, such as 1 or 2, depending on +Be sure to replace `<#>` with a number value, such as 6 or 7, depending on which version you need. ## macOS @@ -60,7 +60,7 @@ necessary prerequisites followed by building from source. 1. Install third-party libraries: - ``` + ```sh sudo apt -y install \ $(sort -u $(find . -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt' | grep -v '/\.git/') | sed '/gz\|sdf/d' | tr '\n' ' ') ``` @@ -97,21 +97,26 @@ necessary prerequisites followed by building from source. ## macOS 1. Clone the repository + + ```sh + git clone https://github.com/gazebosim/gz-launch -b gz-launch<#> ``` - git clone https://github.com/gazebosim/gz-launch -b ign-launch<#> - ``` + Be sure to replace `<#>` with a number value, such as 4 or 5, depending on which version you need. 2. Install dependencies - ``` + + ```sh brew install --only-dependencies gz-launch<#> ``` + Be sure to replace `<#>` with a number value, such as 5 or 6, depending on which version you need. 3. Configure and build - ``` + + ```sh cd gz-launch mkdir build cd build @@ -120,7 +125,8 @@ necessary prerequisites followed by building from source. ``` 4. Optionally, install - ``` + + ```sh sudo make install ``` @@ -132,25 +138,25 @@ You can also generate the documentation from a clone of this repository by follo 1. You will need Doxygen. On Ubuntu Doxygen can be installed using - ``` + ```sh sudo apt-get install doxygen ``` 2. Clone the repository - ``` + ```sh git clone https://github.com/gazebosim/gz-launch ``` 3. Configure and build the documentation. - ``` + ```sh cd gz-launch; mkdir build; cd build; cmake ../; make doc ``` 4. View the documentation by running the following command from the build directory. - ``` + ```sh firefox doxygen/html/index.html ``` @@ -162,12 +168,12 @@ Follow these steps to run tests and static code analysis in your clone of this r 2. Run tests. - ``` + ```sh make test ``` 3. Static code checker. - ``` + ```sh make codecheck ```