From e571f99512cdd9643075b8e0dcf7ea1f7170fcd3 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 4 May 2022 09:15:47 -0700 Subject: [PATCH 1/8] Build cmake, utils and math from source Signed-off-by: Louise Poubel --- .github/ci/dependencies.yaml | 13 +++++++++++++ .github/ci/packages.apt | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 .github/ci/dependencies.yaml diff --git a/.github/ci/dependencies.yaml b/.github/ci/dependencies.yaml new file mode 100644 index 0000000..b93b57e --- /dev/null +++ b/.github/ci/dependencies.yaml @@ -0,0 +1,13 @@ +repositories: + gz-cmake: + type: git + url: https://github.com/ignitionrobotics/ign-cmake + version: gz_cmake_project + gz-math: + type: git + url: https://github.com/ignitionrobotics/ign-math + version: gz_cmake_project + gz-utils: + type: git + url: https://github.com/ignitionrobotics/ign-utils + version: gz_cmake_project diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index d5af8fe..384ee86 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,11 +1,8 @@ -libignition-cmake3-dev libignition-common5-dev libignition-fuel-tools8-dev libignition-gazebo7-dev libignition-gui7-dev libignition-launch6-dev -libignition-math7-dev -libignition-math7-eigen3-dev libignition-msgs9-dev libignition-physics6-dev libignition-plugin2-dev @@ -14,3 +11,16 @@ libignition-sensors7-dev libignition-tools2-dev libignition-transport12-dev libsdformat13-dev + +build-essential +cmake +pkg-config + +libeigen3-dev +libignition-cmake2-dev +libpython3-dev +python3-distutils +python3-pybind11 +ruby-dev +swig + From 700e83aacac01f5424626746ed2dcf7e642d78b7 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 9 May 2022 11:25:41 -0700 Subject: [PATCH 2/8] Remove apt-installed ignition Signed-off-by: Louise Poubel --- .github/ci/before_cmake.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/ci/before_cmake.sh diff --git a/.github/ci/before_cmake.sh b/.github/ci/before_cmake.sh new file mode 100644 index 0000000..2654bab --- /dev/null +++ b/.github/ci/before_cmake.sh @@ -0,0 +1 @@ +apt-get purge -y ".*ignition.*" ".*sdformat.*" From e77c250fc2513b47c448fe73f0e2520e97dfd553 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 9 May 2022 11:59:48 -0700 Subject: [PATCH 3/8] Remove ignition Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 384ee86..58d018a 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,17 +1,3 @@ -libignition-common5-dev -libignition-fuel-tools8-dev -libignition-gazebo7-dev -libignition-gui7-dev -libignition-launch6-dev -libignition-msgs9-dev -libignition-physics6-dev -libignition-plugin2-dev -libignition-rendering7-dev -libignition-sensors7-dev -libignition-tools2-dev -libignition-transport12-dev -libsdformat13-dev - build-essential cmake pkg-config From 120594f004d5f96ee00bdf332e195133f611727d Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 9 May 2022 12:52:15 -0700 Subject: [PATCH 4/8] test before comp Signed-off-by: Louise Poubel --- .../{before_cmake.sh => before_dep_compilation.sh} | 0 .github/ci/packages.apt | 12 ------------ .github/workflows/ci.yml | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) rename .github/ci/{before_cmake.sh => before_dep_compilation.sh} (100%) diff --git a/.github/ci/before_cmake.sh b/.github/ci/before_dep_compilation.sh similarity index 100% rename from .github/ci/before_cmake.sh rename to .github/ci/before_dep_compilation.sh diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 58d018a..e69de29 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,12 +0,0 @@ -build-essential -cmake -pkg-config - -libeigen3-dev -libignition-cmake2-dev -libpython3-dev -python3-distutils -python3-pybind11 -ruby-dev -swig - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22a64a1..9162bd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@focal + uses: ignition-tooling/action-ignition-ci@chapulina/focal/before_dep with: tests-enabled: false jammy-ci: From 0704488339df1a99c34ea017067c101e87750813 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 9 May 2022 13:12:26 -0700 Subject: [PATCH 5/8] use focal CI Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9162bd3..22a64a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@chapulina/focal/before_dep + uses: ignition-tooling/action-ignition-ci@focal with: tests-enabled: false jammy-ci: From c949c53476c9263e5749bfba87fb470db2955c29 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 9 May 2022 18:00:03 -0700 Subject: [PATCH 6/8] more repos Signed-off-by: Louise Poubel --- .github/ci/dependencies.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/ci/dependencies.yaml b/.github/ci/dependencies.yaml index b93b57e..2ff30af 100644 --- a/.github/ci/dependencies.yaml +++ b/.github/ci/dependencies.yaml @@ -1,13 +1,21 @@ repositories: gz-cmake: type: git - url: https://github.com/ignitionrobotics/ign-cmake + url: https://github.com/gazebosim/gz-cmake + version: gz_cmake_project + gz-common: + type: git + url: https://github.com/gazebosim/gz-common version: gz_cmake_project gz-math: type: git - url: https://github.com/ignitionrobotics/ign-math + url: https://github.com/gazebosim/gz-math + version: gz_cmake_project + gz-plugin: + type: git + url: https://github.com/gazebosim/gz-plugin version: gz_cmake_project gz-utils: type: git - url: https://github.com/ignitionrobotics/ign-utils + url: https://github.com/gazebosim/gz-utils version: gz_cmake_project From e44c9b6eaaef7a0443716d49aed2cf033c2014b8 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 8 Jun 2022 20:44:11 -0700 Subject: [PATCH 7/8] remaining libs Signed-off-by: Louise Poubel --- .github/ci/dependencies.yaml | 44 ++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 34 ++++++++++++++-------------- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/.github/ci/dependencies.yaml b/.github/ci/dependencies.yaml index 2ff30af..396e35b 100644 --- a/.github/ci/dependencies.yaml +++ b/.github/ci/dependencies.yaml @@ -7,15 +7,59 @@ repositories: type: git url: https://github.com/gazebosim/gz-common version: gz_cmake_project + gz-fuel-tools: + type: git + url: https://github.com/gazebosim/gz-fuel-tools + version: gz_cmake_project + gz-gazebo: + type: git + url: https://github.com/gazebosim/gz-gazebo + version: gz_cmake_project + gz-gui: + type: git + url: https://github.com/gazebosim/gz-gui + version: gz_cmake_project + gz-launch: + type: git + url: https://github.com/gazebosim/gz-launch + version: gz_cmake_project gz-math: type: git url: https://github.com/gazebosim/gz-math version: gz_cmake_project + gz-msgs: + type: git + url: https://github.com/gazebosim/gz-msgs + version: gz_cmake_project + gz-physics: + type: git + url: https://github.com/gazebosim/gz-physics + version: gz_cmake_project gz-plugin: type: git url: https://github.com/gazebosim/gz-plugin version: gz_cmake_project + gz-rendering: + type: git + url: https://github.com/gazebosim/gz-rendering + version: gz_cmake_project + gz-sensors: + type: git + url: https://github.com/gazebosim/gz-sensors + version: gz_cmake_project + gz-tools: + type: git + url: https://github.com/gazebosim/gz-tools + version: gz_cmake_project + gz-transport: + type: git + url: https://github.com/gazebosim/gz-transport + version: gz_cmake_project gz-utils: type: git url: https://github.com/gazebosim/gz-utils version: gz_cmake_project + sdformat: + type: git + url: https://github.com/osrf/sdformat + version: gz_cmake_project diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d8e4e..29a3106 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,13 +3,13 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-garden VERSION 1.0.0) +project(gz-garden VERSION 1.0.0) #============================================================================ -# Find ignition-cmake +# Find gz-cmake #============================================================================ -# If you get an error at this line, you need to install ignition-cmake -find_package(ignition-cmake3 REQUIRED) +# If you get an error at this line, you need to install gz-cmake +find_package(gz-cmake3 REQUIRED) #============================================================================ # Configure the project @@ -18,19 +18,19 @@ ign_configure_project(VERSION_SUFFIX pre1) # all list of garden packages -ign_find_package(ignition-common5 REQUIRED) -ign_find_package(ignition-fuel_tools8 REQUIRED) -ign_find_package(ignition-gazebo7 REQUIRED) -ign_find_package(ignition-gui7 REQUIRED) -ign_find_package(ignition-launch6 REQUIRED) -ign_find_package(ignition-math7 REQUIRED COMPONENTS eigen3) -ign_find_package(ignition-msgs9 REQUIRED) -ign_find_package(ignition-physics6 REQUIRED) -ign_find_package(ignition-plugin2 REQUIRED) -ign_find_package(ignition-rendering7 REQUIRED) -ign_find_package(ignition-sensors7 REQUIRED) -ign_find_package(ignition-transport12 REQUIRED) -ign_find_package(ignition-utils2 REQUIRED) +ign_find_package(gz-common5 REQUIRED) +ign_find_package(gz-fuel_tools8 REQUIRED) +ign_find_package(gz-sim7 REQUIRED) +ign_find_package(gz-gui7 REQUIRED) +ign_find_package(gz-launch6 REQUIRED) +ign_find_package(gz-math7 REQUIRED COMPONENTS eigen3) +ign_find_package(gz-msgs9 REQUIRED) +ign_find_package(gz-physics6 REQUIRED) +ign_find_package(gz-plugin2 REQUIRED) +ign_find_package(gz-rendering7 REQUIRED) +ign_find_package(gz-sensors7 REQUIRED) +ign_find_package(gz-transport12 REQUIRED) +ign_find_package(gz-utils2 REQUIRED) ign_find_package(sdformat13 REQUIRED) if(build_warnings) From adefe6f13233814a837564cabb483f0a64aa45b4 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 8 Jun 2022 20:53:23 -0700 Subject: [PATCH 8/8] sim Signed-off-by: Louise Poubel --- .github/ci/dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ci/dependencies.yaml b/.github/ci/dependencies.yaml index 396e35b..0d418fb 100644 --- a/.github/ci/dependencies.yaml +++ b/.github/ci/dependencies.yaml @@ -11,10 +11,6 @@ repositories: type: git url: https://github.com/gazebosim/gz-fuel-tools version: gz_cmake_project - gz-gazebo: - type: git - url: https://github.com/gazebosim/gz-gazebo - version: gz_cmake_project gz-gui: type: git url: https://github.com/gazebosim/gz-gui @@ -47,6 +43,10 @@ repositories: type: git url: https://github.com/gazebosim/gz-sensors version: gz_cmake_project + gz-sim: + type: git + url: https://github.com/gazebosim/gz-sim + version: gz_cmake_project gz-tools: type: git url: https://github.com/gazebosim/gz-tools