From 7c7d4e417cd928afbed65292db6fc65a90d17c72 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 31 Aug 2023 12:21:15 -0500 Subject: [PATCH 1/3] Generate documentation for Harmonic Signed-off-by: Addisu Z. Taddese --- tools/build_docs.sh | 5 +++++ tools/scripts/install_common_deps.sh | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build_docs.sh b/tools/build_docs.sh index e7a0d01b3..851c51edb 100755 --- a/tools/build_docs.sh +++ b/tools/build_docs.sh @@ -61,6 +61,11 @@ if [[ $1 == 'all' || $1 == 'garden' || $1 == 'Garden' ]]; then docker build -t gz-garden-docs -f Dockerfile.garden --build-arg GZ_VERSION_PASSWORD --build-arg GZ_VERSION_DATE=`date -Iseconds` --no-cache --build-arg AWS_ACCESS_KEY_ID --build-arg AWS_SECRET_ACCESS_KEY . fi +if [[ $1 == 'all' || $1 == 'harmonic' || $1 == 'Harmonic' ]]; then + echo -e "\e[46m\e[30mUploading documentation for Harmonic\e[0m\e[39m" + docker build -t gz-harmonic-docs -f Dockerfile.harmonic --build-arg GZ_VERSION_PASSWORD --build-arg GZ_VERSION_DATE=`date -Iseconds` --no-cache --build-arg AWS_ACCESS_KEY_ID --build-arg AWS_SECRET_ACCESS_KEY . +fi + # Reminder to tic over cloudfront. echo "WARNING" diff --git a/tools/scripts/install_common_deps.sh b/tools/scripts/install_common_deps.sh index a2f9a6609..75397595b 100755 --- a/tools/scripts/install_common_deps.sh +++ b/tools/scripts/install_common_deps.sh @@ -14,7 +14,6 @@ sudo apt-get install -y \ sudo wget https://packages.osrfoundation.org/gazebo.gpg -O /usr/share/keyrings/pkgs-osrf-archive-keyring.gpg echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-stable.list > /dev/null -echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-nightly $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-nightly.list > /dev/null sudo apt-get update @@ -23,7 +22,6 @@ sudo apt-get install -y \ cmake \ curl \ doxygen \ - g++-8 \ git \ pkg-config \ ruby-dev \ From 698c7e96d20577061728bc791bef56d6d453d42f Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 31 Aug 2023 12:24:54 -0500 Subject: [PATCH 2/3] Forgot a file Signed-off-by: Addisu Z. Taddese --- tools/Dockerfile.harmonic | 86 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 tools/Dockerfile.harmonic diff --git a/tools/Dockerfile.harmonic b/tools/Dockerfile.harmonic new file mode 100644 index 000000000..49b636a5c --- /dev/null +++ b/tools/Dockerfile.harmonic @@ -0,0 +1,86 @@ +FROM ubuntu:jammy + +ENV DEBIAN_FRONTEND=noninteractive + +RUN echo ::group::Container setup + +RUN apt-get update \ + && apt-get install -y \ + sudo tzdata lsb-release \ + && apt-get clean + +ARG GZ_VERSION_PASSWORD +ARG GZ_VERSION_DATE +ARG AWS_ACCESS_KEY_ID +ARG AWS_SECRET_ACCESS_KEY + +COPY scripts/install_common_deps.sh scripts/install_common_deps.sh +RUN scripts/install_common_deps.sh $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY +RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/pkgs-osrf-archive-keyring.gpg] http://packages.osrfoundation.org/gazebo/ubuntu-prerelease $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/gazebo-prerelease.list > /dev/null \ + apt-get update + +COPY scripts/build_gz.sh scripts/build_gz.sh + +RUN echo ::endgroup:: + +RUN scripts/build_gz.sh gazebosim gz-cmake gz-cmake3 n \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-math gz-math7 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-tools gz-tools2 n \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-plugin gz-plugin2 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-common gz-common5 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +# SDFormat's documentation is uploaded in a different way +# Keeping it here for completeness +# RUN scripts/build_gz.sh osrf sdformat sdf11 n \ +# $GZ_VERSION_DATE \ +# $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-msgs gz-msgs10 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-transport gz-transport13 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-fuel-tools gz-fuel-tools9 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-rendering gz-rendering8 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-sensors gz-sensors8 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-gui gz-gui8 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-physics gz-physics7 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-sim gz-sim8 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-launch gz-launch7 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 From 1692d8068c42a11a95e51e5e250dfb45dd67f0e1 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 31 Aug 2023 12:38:01 -0500 Subject: [PATCH 3/3] Upload docs for gz-cmake, add gz-utils Signed-off-by: Addisu Z. Taddese --- tools/Dockerfile.harmonic | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/Dockerfile.harmonic b/tools/Dockerfile.harmonic index 49b636a5c..ccc949a2c 100644 --- a/tools/Dockerfile.harmonic +++ b/tools/Dockerfile.harmonic @@ -23,7 +23,11 @@ COPY scripts/build_gz.sh scripts/build_gz.sh RUN echo ::endgroup:: -RUN scripts/build_gz.sh gazebosim gz-cmake gz-cmake3 n \ +RUN scripts/build_gz.sh gazebosim gz-cmake gz-cmake3 y \ + $GZ_VERSION_DATE \ + $GZ_VERSION_PASSWORD; exit 0 + +RUN scripts/build_gz.sh gazebosim gz-utils gz-utils2 y \ $GZ_VERSION_DATE \ $GZ_VERSION_PASSWORD; exit 0