From c46a65cdef4a42b3acdfb8babb64bd913f964a0d Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 15:30:19 -0500 Subject: [PATCH 1/6] Add package.xml Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 13 +++++++++++++ package.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 package.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ce3ec58..8e26d886 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,3 +29,16 @@ jobs: - name: Compile and test id: ci uses: gazebo-tooling/action-gz-ci@jammy + package-xml: + runs-on: ubuntu-latest + name: package.xml and CMake versions match + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Check versions + run: | + package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) + echo "Version in package.xml: ${package_xml_version}" + cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) + echo "Version in CMake: ${cmake_version}" + [ package_xml_version = cmake_version ] diff --git a/package.xml b/package.xml new file mode 100644 index 00000000..c8f64634 --- /dev/null +++ b/package.xml @@ -0,0 +1,29 @@ + + + gz-common5 + + 5.5.0 + Gazebo Common : AV, Graphics, Events, and much more. + Nate Koenig + Apache License 2.0 + https://github.com/gazebosim/gz-common + + cmake + pkg-config + + gz-cmake3 + + assimp-dev + ffmpeg-dev + gz-math7 + gz-utils2 + libfreeimage-dev + libgdal-dev + libgts + tinyxml2 + uuid + + + cmake + + From 1d288959de1b6715491e8a629087ca58b1ac7b24 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 15:38:01 -0500 Subject: [PATCH 2/6] Update version Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 1 + package.xml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e26d886..5e984818 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,7 @@ jobs: uses: actions/checkout@v4 - name: Check versions run: | + echo "Extract version numbers and compare" package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) echo "Version in package.xml: ${package_xml_version}" cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) diff --git a/package.xml b/package.xml index c8f64634..2704fa53 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,7 @@ gz-common5 - - 5.5.0 + 5.5.1 Gazebo Common : AV, Graphics, Events, and much more. Nate Koenig Apache License 2.0 From 403f54151ca5eb83547ffb92ff5a59db78425c7b Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 15:46:25 -0500 Subject: [PATCH 3/6] Fix version checker Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 2 +- package.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e984818..65dbc55b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,4 +42,4 @@ jobs: echo "Version in package.xml: ${package_xml_version}" cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) echo "Version in CMake: ${cmake_version}" - [ package_xml_version = cmake_version ] + [ $package_xml_version = $cmake_version ] diff --git a/package.xml b/package.xml index 2704fa53..e9a792df 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ gz-common5 - 5.5.1 + 5.5.0 Gazebo Common : AV, Graphics, Events, and much more. Nate Koenig Apache License 2.0 From 9501c3589f10d4beb1e21992c33bc742e843bce1 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 15:47:27 -0500 Subject: [PATCH 4/6] Fix version Signed-off-by: Addisu Z. Taddese --- package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.xml b/package.xml index e9a792df..2704fa53 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ gz-common5 - 5.5.0 + 5.5.1 Gazebo Common : AV, Graphics, Events, and much more. Nate Koenig Apache License 2.0 From 32a2df1a36667e27cda7dc4a11081f4cc93374a7 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 15:49:41 -0500 Subject: [PATCH 5/6] Make package.xml validation its own workflow Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 14 -------------- .github/workflows/package_xml.yml | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 .github/workflows/package_xml.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65dbc55b..0ce3ec58 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,17 +29,3 @@ jobs: - name: Compile and test id: ci uses: gazebo-tooling/action-gz-ci@jammy - package-xml: - runs-on: ubuntu-latest - name: package.xml and CMake versions match - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Check versions - run: | - echo "Extract version numbers and compare" - package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) - echo "Version in package.xml: ${package_xml_version}" - cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) - echo "Version in CMake: ${cmake_version}" - [ $package_xml_version = $cmake_version ] diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml new file mode 100644 index 00000000..5b5c6d88 --- /dev/null +++ b/.github/workflows/package_xml.yml @@ -0,0 +1,20 @@ +name: Validate package.xml + +on: + pull_request: + +jobs: + package-xml: + runs-on: ubuntu-latest + name: package.xml and CMake versions match + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Check versions + run: | + echo "Extract version numbers and compare" + package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) + echo "Version in package.xml: ${package_xml_version}" + cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) + echo "Version in CMake: ${cmake_version}" + [ $package_xml_version = $cmake_version ] From 46d36c3e0f7722ac96d59d3038563b3a6fd8e601 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Fri, 3 May 2024 13:03:09 -0500 Subject: [PATCH 6/6] Update version and workflow file Signed-off-by: Addisu Z. Taddese --- .github/workflows/package_xml.yml | 13 ++----------- package.xml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml index 5b5c6d88..4bd4a9aa 100644 --- a/.github/workflows/package_xml.yml +++ b/.github/workflows/package_xml.yml @@ -6,15 +6,6 @@ on: jobs: package-xml: runs-on: ubuntu-latest - name: package.xml and CMake versions match + name: Validate package.xml steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Check versions - run: | - echo "Extract version numbers and compare" - package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) - echo "Version in package.xml: ${package_xml_version}" - cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) - echo "Version in CMake: ${cmake_version}" - [ $package_xml_version = $cmake_version ] + - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy diff --git a/package.xml b/package.xml index 2704fa53..a3dbc464 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ gz-common5 - 5.5.1 + 5.6.0 Gazebo Common : AV, Graphics, Events, and much more. Nate Koenig Apache License 2.0