From 2e256e1d3e5ae8af4fca3cb3a2ddf5a99da70d5a Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 9 Oct 2023 17:03:57 -0500 Subject: [PATCH 1/7] Bumps in ionic : ci_matching_branch/bump_ionic_gz-ionic Signed-off-by: Addisu Z. Taddese --- Formula/gz-ionic.rb | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Formula/gz-ionic.rb diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb new file mode 100644 index 000000000..074db0344 --- /dev/null +++ b/Formula/gz-ionic.rb @@ -0,0 +1,54 @@ +class GzHarmonic < Formula + include Language::Python::Virtualenv + + desc "Collection of gazebo simulation software" + homepage "https://github.com/gazebosim/gz-harmonic" + url "https://github.com/gazebosim/gz-ionic.git", branch: "main" + version "0.999.999~0~20231009" + license "Apache-2.0" + + head "https://github.com/gazebosim/gz-harmonic.git", branch: "main" + + depends_on "cmake" => :build + depends_on "python@3.11" => [:build, :test] + + depends_on "gz-cmake4" + depends_on "gz-common6" + depends_on "gz-fuel-tools9" + depends_on "gz-gui8" + depends_on "gz-launch7" + depends_on "gz-math8" + depends_on "gz-msgs10" + depends_on "gz-physics7" + depends_on "gz-plugin3" + depends_on "gz-rendering8" + depends_on "gz-sensors8" + depends_on "gz-sim8" + depends_on "gz-tools3" + depends_on "gz-transport13" + depends_on "gz-utils3" + depends_on "pkg-config" + depends_on "sdformat14" + + resource "PyYAML" do + url "https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c/PyYAML-5.3.1.tar.gz" + sha256 "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d" + end + + def install + mkdir "build" do + system "cmake", "..", *std_cmake_args + system "make", "install" + end + + venv = virtualenv_create(libexec, Formula["python@3.11"].opt_libexec/"bin/python") + %w[PyYAML vcstool].each do |pkg| + venv.pip_install pkg + end + end + + test do + yaml_file = share/"gz/gz-harmonic/gazebodistro/collection-harmonic.yaml" + system libexec/"bin/vcs", "validate", "--input", yaml_file + end +end From 732f714ede992c7e27f9b24d32a326ddcafd81b5 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 16 Oct 2023 17:45:43 -0500 Subject: [PATCH 2/7] Bumps in ionic : ci_matching_branch/bump_ionic_gz-ionic Signed-off-by: Addisu Z. Taddese --- Formula/gz-ionic.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb index 074db0344..5fcd59849 100644 --- a/Formula/gz-ionic.rb +++ b/Formula/gz-ionic.rb @@ -4,7 +4,7 @@ class GzHarmonic < Formula desc "Collection of gazebo simulation software" homepage "https://github.com/gazebosim/gz-harmonic" url "https://github.com/gazebosim/gz-ionic.git", branch: "main" - version "0.999.999~0~20231009" + version "0.999.999-0-20231016" license "Apache-2.0" head "https://github.com/gazebosim/gz-harmonic.git", branch: "main" @@ -14,21 +14,21 @@ class GzHarmonic < Formula depends_on "gz-cmake4" depends_on "gz-common6" - depends_on "gz-fuel-tools9" - depends_on "gz-gui8" - depends_on "gz-launch7" + depends_on "gz-fuel-tools10" + depends_on "gz-gui9" + depends_on "gz-launch8" depends_on "gz-math8" - depends_on "gz-msgs10" - depends_on "gz-physics7" + depends_on "gz-msgs11" + depends_on "gz-physics8" depends_on "gz-plugin3" - depends_on "gz-rendering8" - depends_on "gz-sensors8" - depends_on "gz-sim8" - depends_on "gz-tools3" - depends_on "gz-transport13" + depends_on "gz-rendering9" + depends_on "gz-sensors9" + depends_on "gz-sim9" + depends_on "gz-tools2" + depends_on "gz-transport14" depends_on "gz-utils3" depends_on "pkg-config" - depends_on "sdformat14" + depends_on "sdformat15" resource "PyYAML" do url "https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c/PyYAML-5.3.1.tar.gz" From 2e3617c0650a200097dc20ca8f5a833ab0755fcf Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 23 Oct 2023 11:29:27 -0700 Subject: [PATCH 3/7] gz-ionic: replace harmonic with ionic Signed-off-by: Steve Peters --- Formula/gz-ionic.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb index 5fcd59849..7292a78ed 100644 --- a/Formula/gz-ionic.rb +++ b/Formula/gz-ionic.rb @@ -1,13 +1,13 @@ -class GzHarmonic < Formula +class GzIonic < Formula include Language::Python::Virtualenv desc "Collection of gazebo simulation software" - homepage "https://github.com/gazebosim/gz-harmonic" + homepage "https://github.com/gazebosim/gz-ionic" url "https://github.com/gazebosim/gz-ionic.git", branch: "main" version "0.999.999-0-20231016" license "Apache-2.0" - head "https://github.com/gazebosim/gz-harmonic.git", branch: "main" + head "https://github.com/gazebosim/gz-ionic.git", branch: "main" depends_on "cmake" => :build depends_on "python@3.11" => [:build, :test] @@ -48,7 +48,7 @@ def install end test do - yaml_file = share/"gz/gz-harmonic/gazebodistro/collection-harmonic.yaml" + yaml_file = share/"gz/gz-ionic/gazebodistro/collection-ionic.yaml" system libexec/"bin/vcs", "validate", "--input", yaml_file end end From 3f77d2959e44ba8bd51f2d954fa58b9fe7b1ecaa Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 25 Oct 2023 13:12:43 -0500 Subject: [PATCH 4/7] Install release_notes.md Signed-off-by: Addisu Z. Taddese --- Formula/gz-ionic.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb index 7292a78ed..d9ff51331 100644 --- a/Formula/gz-ionic.rb +++ b/Formula/gz-ionic.rb @@ -30,25 +30,15 @@ class GzIonic < Formula depends_on "pkg-config" depends_on "sdformat15" - resource "PyYAML" do - url "https://files.pythonhosted.org/packages/64/c2/b80047c7ac2478f9501676c988a5411ed5572f35d1beff9cae07d321512c/PyYAML-5.3.1.tar.gz" - sha256 "b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d" - end - def install mkdir "build" do system "cmake", "..", *std_cmake_args system "make", "install" end - venv = virtualenv_create(libexec, Formula["python@3.11"].opt_libexec/"bin/python") - %w[PyYAML vcstool].each do |pkg| - venv.pip_install pkg - end end test do - yaml_file = share/"gz/gz-ionic/gazebodistro/collection-ionic.yaml" - system libexec/"bin/vcs", "validate", "--input", yaml_file + assert_predicate share/"gz/gz-ionic/release_notes.md", :exist? end end From 045e392fd281323d5d9d526101aec394fdb8e67c Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Wed, 25 Oct 2023 13:30:32 -0500 Subject: [PATCH 5/7] Fix style Signed-off-by: Addisu Z. Taddese --- Formula/gz-ionic.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb index d9ff51331..73537ea0f 100644 --- a/Formula/gz-ionic.rb +++ b/Formula/gz-ionic.rb @@ -35,7 +35,6 @@ def install system "cmake", "..", *std_cmake_args system "make", "install" end - end test do From fe40a73d9b104d2d16428d8e9c3259c097033688 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 30 Oct 2023 18:56:31 +0000 Subject: [PATCH 6/7] remove alias Signed-off-by: Ian Chen --- Aliases/gz-ionic | 1 - 1 file changed, 1 deletion(-) delete mode 120000 Aliases/gz-ionic diff --git a/Aliases/gz-ionic b/Aliases/gz-ionic deleted file mode 120000 index af9222caa..000000000 --- a/Aliases/gz-ionic +++ /dev/null @@ -1 +0,0 @@ -../Formula/gz-harmonic.rb \ No newline at end of file From 3c8724af626db51b08a9131af71ab604a92f7ff1 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 30 Oct 2023 13:18:06 -0700 Subject: [PATCH 7/7] gz-ionic: remove unneeded python dep --- Formula/gz-ionic.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/Formula/gz-ionic.rb b/Formula/gz-ionic.rb index 73537ea0f..196996052 100644 --- a/Formula/gz-ionic.rb +++ b/Formula/gz-ionic.rb @@ -10,7 +10,6 @@ class GzIonic < Formula head "https://github.com/gazebosim/gz-ionic.git", branch: "main" depends_on "cmake" => :build - depends_on "python@3.11" => [:build, :test] depends_on "gz-cmake4" depends_on "gz-common6"