Skip to content

Commit 4239691

Browse files
scpetersj-riveroosrfbuild
authored
Rebuild ionic bottles (#3086)
* unbottled_dependencies.sh: specify bottle tag Optionally specify the OS/CPU combination when checking whether formulae are bottled. * gz-common6: revision bump rebuild * gz-fuel-tools10: revision bump rebuild * gz-gui9: revision bump rebuild * gz-launch8: revision bump rebuild * gz-math8: revision bump rebuild * gz-msgs11: revision bump rebuild * gz-physics8: revision bump rebuild * gz-rendering9: revision bump rebuild * gz-sensors9: revision bump rebuild * gz-sim9: revision bump rebuild * gz-transport14: revision bump rebuild * sdformat15: revision bump rebuild * update bottle. Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org> Co-authored-by: OSRF Build Bot <osrfbuild@osrfoundation.org>
1 parent b88ebb2 commit 4239691

13 files changed

+99
-14
lines changed

.github/ci/unbottled_dependencies.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,37 @@
1818
# tap of a specified formula.
1919
#
2020
# Usage:
21-
# $ ./unbottled_dependencies.sh <formula>
21+
# $ ./unbottled_dependencies.sh <formula> [<bottle_tag>]
2222
#
2323
# For example, to print the unbottled dependencies of gz-harmonic from the
24-
# osrf/simulation tap:
24+
# osrf/simulation tap for the current OS and CPU architecture:
2525
#
2626
# ./unbottled_dependencies.sh gz-harmonic
27+
#
28+
# To check for unbottled dependencies of a specific OS and CPU combination,
29+
# pass a bottle tag as an additional parameter, for example:
30+
#
31+
# ./unbottled_dependencies.sh gz-harmonic arm64_sonoma
2732

2833
FORMULA=${1}
34+
BOTTLE_TAG=${2}
2935

30-
if [ $# -ne 1 ]; then
31-
echo "unbottled_dependencies.sh <formula>"
36+
if [ $# -ne 1 ] && [ $# -ne 2 ]; then
37+
echo "unbottled_dependencies.sh <formula> [<bottle_tag>]"
3238
exit 1
3339
fi
3440

41+
if [ -n "${BOTTLE_TAG}" ]; then
42+
BOTTLE_FLAG="--tag"
43+
fi
44+
3545
for f in $(brew deps ${FORMULA} --full-name | grep ^osrf/simulation/)
3646
do
3747
# brew unbottled prints "already bottled" for bottled formulae
3848
# but has different output for formulae that are "ready to bottle" or
3949
# that have "unbottled deps". So just echo the name of any formula for which
4050
# `brew unbottled` doesn't print "already bottled"
41-
if ! brew unbottled $f | grep --quiet "already bottled"; then
51+
if ! brew unbottled $f ${BOTTLE_FLAG} ${BOTTLE_TAG} | grep --quiet "already bottled"; then
4252
echo $f
4353
fi
4454
done

Formula/gz-common6.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzCommon6 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-common/releases/gz-common-6.1.0.tar.bz2"
55
sha256 "e79eacbce58f6d0bc5d34f58ed363c44cf89f61562b0a7d4ea1b586441e10b65"
66
license "Apache-2.0"
7-
revision 3
7+
revision 4
88

99
head "https://github.com/gazebosim/gz-common.git", branch: "gz-common6"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "a4a8abf5a7d372e77ee7ef4f6a548b794d89dbd1f81cbd00596a7197a845596e"
14+
sha256 cellar: :any, ventura: "465892ba5e27f13d10bfef486a1a6d72786fff853943aad733b083a19da8721b"
15+
end
16+
1117
depends_on "assimp"
1218
depends_on "cmake"
1319
depends_on "ffmpeg"

Formula/gz-fuel-tools10.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzFuelTools10 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-fuel-tools/releases/gz-fuel_tools-10.1.0.tar.bz2"
55
sha256 "37ae351be9a9b281d078e36068422dd096f59f46c72c4ef490800dfeb7653e1d"
66
license "Apache-2.0"
7-
revision 3
7+
revision 4
88

99
head "https://github.com/gazebosim/gz-fuel-tools.git", branch: "gz-fuel-tools10"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "abf2a518c6a35db6baced75d7030b8f50a86808d8ef58e864b729183503c86c4"
14+
sha256 cellar: :any, ventura: "5c172a2e3ff38af2c00ab7f2b0c158e990cdcfbafecc2c165b834b3dc8cb8b46"
15+
end
16+
1117
depends_on "abseil"
1218
depends_on "cmake"
1319
depends_on "gz-cmake4"

Formula/gz-gui9.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzGui9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-gui/releases/gz-gui-9.0.1.tar.bz2"
55
sha256 "873d9950b1aa577b5b7f864caa4c3f759e29d5b67b81c4d69ab7d37043c4f96d"
66
license "Apache-2.0"
7-
revision 9
7+
revision 10
88

99
head "https://github.com/gazebosim/gz-gui.git", branch: "gz-gui9"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "dd41fc5c92a2ab3fb7443ab5446267d387380093612686e796c62b272fbbc43f"
14+
sha256 ventura: "762bc11ce8fb677c4ecfc21eb12d46796aca3cdc11f932568189afbd649c7de1"
15+
end
16+
1117
depends_on "cmake" => [:build, :test]
1218
depends_on "pkgconf" => [:build, :test]
1319
depends_on "abseil"

Formula/gz-launch8.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzLaunch8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-launch/releases/gz-launch-8.0.1.tar.bz2"
55
sha256 "ce89cfe1554bf64ea63bbbcd7ce9624dd488a72a688cd620f97cabab776245a7"
66
license "Apache-2.0"
7-
revision 9
7+
revision 10
88

99
head "https://github.com/gazebosim/gz-launch.git", branch: "gz-launch8"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "850facc9bfa1c83954948e240c28fb3926cb81c8fe52edd9471006d562b0720a"
14+
sha256 ventura: "f89caa098cf87105d1d98ccd4e8914738f43fe187ac12b34b801fcb7cbfb78dd"
15+
end
16+
1117
depends_on "cmake" => :build
1218
depends_on "pkgconf" => :build
1319

Formula/gz-math8.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzMath8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-math/releases/gz-math-8.2.0.tar.bz2"
55
sha256 "2275a93f10dc95acebcdcb2678757f0daf64bca02ddb086ca372f2bdd5580b4e"
66
license "Apache-2.0"
7-
revision 1
7+
revision 2
88

99
head "https://github.com/gazebosim/gz-math.git", branch: "gz-math8"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "9648e78103c22288ae93abe530f6c65d64e3fe9445e9e08198800402462857a9"
14+
sha256 cellar: :any, ventura: "c707470f326ef3f4fb7ce20b847f92be3a843597d45de6351f04cb93e7373f85"
15+
end
16+
1117
depends_on "cmake" => :build
1218
depends_on "doxygen" => :build
1319
depends_on "pybind11" => :build

Formula/gz-msgs11.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzMsgs11 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-msgs/releases/gz-msgs-11.1.0.tar.bz2"
55
sha256 "2343f0975d00fb21dd87de15603161981c920e0e4b33e735863a259f488f36d0"
66
license "Apache-2.0"
7-
revision 2
7+
revision 3
88

99
head "https://github.com/gazebosim/gz-msgs.git", branch: "gz-msgs11"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "ac7e91e4e580070b912a89e9285e8c28e25a829843a56bba5898b57abc1c11d1"
14+
sha256 ventura: "0299b471f2d03262551690f8bb91352ec50054ef7dc23a95a3a4521683f58c7a"
15+
end
16+
1117
depends_on "python@3.12" => [:build, :test]
1218
depends_on "python@3.13" => [:build, :test]
1319
depends_on "abseil"

Formula/gz-physics8.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@ class GzPhysics8 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-physics/releases/gz-physics-8.3.0.tar.bz2"
55
sha256 "ca274cca45c2d6808f4aa09ad01ba6ce17b50a28f71d83dbd8c38b6621c61ef2"
66
license "Apache-2.0"
7+
revision 1
78

89
head "https://github.com/gazebosim/gz-physics.git", branch: "gz-physics8"
910

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "3b1dc2900b5230d37c81a06e5701be5ce90b7b3a4ff5b10130c3c04c12cf4a01"
14+
sha256 ventura: "ec3f0596edbb5ad62de9cd74025cb44d64eff06e75434864f02a5f69d7d94839"
15+
end
16+
1017
depends_on "cmake" => [:build, :test]
1118

1219
depends_on "bullet"

Formula/gz-rendering9.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,16 @@ class GzRendering9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-rendering/releases/gz-rendering-9.3.0.tar.bz2"
55
sha256 "0d5ddd8d79fd5dbdd53978f21fb0e6fbd3f8d3d0ea98427538c91d4eb19568c7"
66
license "Apache-2.0"
7+
revision 1
78

89
head "https://github.com/gazebosim/gz-rendering.git", branch: "gz-rendering9"
910

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 sonoma: "4927b283412f7a14d419705d5d71a03e471531d19c724b9098aaef305e756e76"
14+
sha256 ventura: "8890e6315613acbb46f309d7908d264ddf6c2a2cf0e3125cb9c147a130e50475"
15+
end
16+
1017
depends_on "cmake" => [:build, :test]
1118
depends_on "pkgconf" => [:build, :test]
1219

Formula/gz-sensors9.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@ class GzSensors9 < Formula
44
url "https://osrf-distributions.s3.amazonaws.com/gz-sensors/releases/gz-sensors-9.2.0.tar.bz2"
55
sha256 "af2ec9a453a830338e80e94954160030e81b3ff8f60853e7c5730cdd2950be85"
66
license "Apache-2.0"
7-
revision 1
7+
revision 2
88

99
head "https://github.com/gazebosim/gz-sensors.git", branch: "gz-sensors9"
1010

11+
bottle do
12+
root_url "https://osrf-distributions.s3.amazonaws.com/bottles-simulation"
13+
sha256 cellar: :any, sonoma: "f019a9266e92aaa8d484f5534c6efa1d1a0f7a5c42fcca36357af37fe3738278"
14+
sha256 cellar: :any, ventura: "3653171d24658920eea947472af1da4b364c6c1eb8c37e4bd5252fc337ed1d42"
15+
end
16+
1117
depends_on "cmake" => [:build, :test]
1218
depends_on "pkgconf" => [:build, :test]
1319

0 commit comments

Comments
 (0)