From 9262c79d44ced082e9134b16155061752d24d59c Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 22 Jun 2024 21:58:45 -0700 Subject: [PATCH] Remove archlinux support (cherry picked from commit e1e31a7fb24e3c0b7d8565c4322bcd3981e8ceaf) --- .github/workflows/cache_docker.yml | 2 +- .github/workflows/ci_ubuntu.yml | 2 +- docker/dev/v6.14/Dockerfile.archlinux | 51 ------------ docker/dev/v6.14/Dockerfile.archlinux-min | 39 ---------- docker/dev/v6.14/Dockerfile.ubuntu.noble | 1 - docker/dev/v6.14/Dockerfile.ubuntu.oracular | 77 +++++++++++++++++++ .../locales/ko/LC_MESSAGES/overview.po | 4 +- docs/readthedocs/overview.rst | 2 +- 8 files changed, 82 insertions(+), 96 deletions(-) delete mode 100644 docker/dev/v6.14/Dockerfile.archlinux delete mode 100644 docker/dev/v6.14/Dockerfile.archlinux-min create mode 100644 docker/dev/v6.14/Dockerfile.ubuntu.oracular diff --git a/.github/workflows/cache_docker.yml b/.github/workflows/cache_docker.yml index fe37b23f9bf16..e45571d9fc09b 100644 --- a/.github/workflows/cache_docker.yml +++ b/.github/workflows/cache_docker.yml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [jammy, noble] + distro: [jammy, noble, oracular] dart_version: [v6.14] platforms: ["linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"] build_min: [OFF] diff --git a/.github/workflows/ci_ubuntu.yml b/.github/workflows/ci_ubuntu.yml index 0b4ada103aff4..0040d27fbd8e0 100644 --- a/.github/workflows/ci_ubuntu.yml +++ b/.github/workflows/ci_ubuntu.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: # Supported LTS versions - os: [ubuntu-jammy, ubuntu-noble, archlinux] + os: [ubuntu-jammy, ubuntu-noble] build_type: [Release] codecov: [OFF] check_format: [OFF] diff --git a/docker/dev/v6.14/Dockerfile.archlinux b/docker/dev/v6.14/Dockerfile.archlinux deleted file mode 100644 index 5b28271295d39..0000000000000 --- a/docker/dev/v6.14/Dockerfile.archlinux +++ /dev/null @@ -1,51 +0,0 @@ -ARG TARGETPLATFORM=linux/amd64 -FROM --platform=$TARGETPLATFORM jslee02/dart-dev:archlinux-min-v6.14 - -USER builder - -# ============================================================================== -# DART optional dependencies -# ============================================================================== -RUN yay -Syu --needed --noconfirm \ - bullet \ - coin-or-ipopt \ - freeglut \ - nlopt \ - octomap \ - opencl-clhpp \ - opencl-headers \ - opencl-icd-loader \ - openscenegraph \ - pagmo \ - spdlog \ - tinyxml2 \ - urdfdom - -# ============================================================================== -# Python binding dependencies -# ============================================================================== -RUN yay -Syu --needed --noconfirm \ - python3 \ - python-pip \ - pybind11 \ - python-numpy \ - python-pytest \ - python-requests \ - python-setuptools - -USER root - -# ode -RUN git clone https://bitbucket.org/odedevs/ode.git -b 'master' \ - && mkdir -p ode/build \ - && cmake ode \ - -B ode/build \ - -DCMAKE_BUILD_TYPE=Release \ - -DODE_WITH_TESTS=OFF \ - -DODE_WITH_DEMOS=OFF \ - -DODE_WITH_LIBCCD=ON \ - -DODE_WITH_LIBCCD_SYSTEM=ON \ - -DODE_WITH_LIBCCD_BOX_CYL=OFF \ - -DODE_DOUBLE_PRECISION=ON \ - && cmake --build ode/build --target install -j${NUM_CORES} \ - && rm -rf ode diff --git a/docker/dev/v6.14/Dockerfile.archlinux-min b/docker/dev/v6.14/Dockerfile.archlinux-min deleted file mode 100644 index 1fe649e6deb0d..0000000000000 --- a/docker/dev/v6.14/Dockerfile.archlinux-min +++ /dev/null @@ -1,39 +0,0 @@ -ARG TARGETPLATFORM=linux/amd64 -FROM --platform=$TARGETPLATFORM archlinux:latest - -#=============================================================================== -# Install packages only available in pacman -#=============================================================================== -RUN pacman -Syuq --noconfirm glu - -#=============================================================================== -# Install yay -#=============================================================================== -RUN pacman -Syuq --noconfirm git base-devel sudo go -RUN echo "Defaults lecture = never" > /etc/sudoers.d/privacy \ - && echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/wheel \ - && useradd -m -G wheel -s /bin/bash builder -USER builder -WORKDIR /home/builder -RUN git clone https://aur.archlinux.org/yay.git --single-branch --depth 1 \ - && cd yay \ - && makepkg -si --noconfirm \ - && cd .. \ - && rm -rf .cache yay - -#=============================================================================== -# Build tools -#=============================================================================== -RUN yay -Syu --needed --noconfirm \ - clang \ - cmake \ - doxygen \ - valgrind - -# ============================================================================== -# DART required dependencies -# ============================================================================== -RUN yay -Syu --needed --noconfirm \ - assimp eigen fcl fmt - -USER root diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.noble b/docker/dev/v6.14/Dockerfile.ubuntu.noble index 2a91654d30c68..8882bfd8b3886 100644 --- a/docker/dev/v6.14/Dockerfile.ubuntu.noble +++ b/docker/dev/v6.14/Dockerfile.ubuntu.noble @@ -65,7 +65,6 @@ RUN apt-get install -y --no-install-recommends \ pybind11-dev \ python3 \ python3-dev \ - python3-distutils \ python3-numpy \ python3-pip \ python3-pytest \ diff --git a/docker/dev/v6.14/Dockerfile.ubuntu.oracular b/docker/dev/v6.14/Dockerfile.ubuntu.oracular new file mode 100644 index 0000000000000..4c47e6eabe778 --- /dev/null +++ b/docker/dev/v6.14/Dockerfile.ubuntu.oracular @@ -0,0 +1,77 @@ +ARG TARGETPLATFORM=linux/amd64 +FROM --platform=$TARGETPLATFORM ubuntu:oracular + +ARG DEBIAN_FRONTEND=noninteractive + +# Use /bin/bash to use pushd/popd +SHELL ["/bin/bash", "-c"] + +# Update apt-get +RUN apt-get update -qq + +# ============================================================================== +# Build tools +# ============================================================================== +RUN apt-get install -y --no-install-recommends \ + build-essential \ + clang \ + clang-format-14 \ + cmake \ + curl \ + doxygen \ + git \ + lcov \ + lsb-release \ + pkg-config \ + software-properties-common \ + valgrind + +# ============================================================================== +# DART required dependencies +# ============================================================================== +RUN apt-get install -y --no-install-recommends \ + libassimp-dev \ + libeigen3-dev \ + libfcl-dev \ + libfmt-dev + +# ============================================================================== +# DART optional dependencies +# ============================================================================== + +RUN apt-get install -y --no-install-recommends \ + coinor-libipopt-dev \ + freeglut3-dev \ + libxi-dev \ + libxmu-dev \ + libbullet-dev \ + libtinyxml2-dev \ + liburdfdom-dev \ + liburdfdom-headers-dev \ + libopenscenegraph-dev \ + libnlopt-cxx-dev \ + liboctomap-dev \ + libode-dev \ + libimgui-dev \ + libspdlog-dev \ + libpagmo-dev + +# ============================================================================== +# Python binding dependencies +# ============================================================================== + +RUN apt-get install -y --no-install-recommends \ + libpython3-dev \ + pybind11-dev \ + python3 \ + python3-dev \ + python3-numpy \ + python3-pip \ + python3-pytest \ + python3-setuptools + +# ============================================================================== +# Clean up +# ============================================================================== + +RUN rm -rf /var/lib/apt/lists/* diff --git a/docs/readthedocs/locales/ko/LC_MESSAGES/overview.po b/docs/readthedocs/locales/ko/LC_MESSAGES/overview.po index 60f764a637d1e..890bffb5e68ae 100644 --- a/docs/readthedocs/locales/ko/LC_MESSAGES/overview.po +++ b/docs/readthedocs/locales/ko/LC_MESSAGES/overview.po @@ -100,9 +100,9 @@ msgstr "BSD 라이센스로 배포되는 오픈 소스 C++ 라이브러리 입 #: ../../overview.rst:24 d2ed9cf688bd4dc6b2e1e9f41f61d4bd msgid "" -"Supports multiple platforms including Ubuntu, Archlinux, FreeBSD, macOS, " +"Supports multiple platforms including Ubuntu, FreeBSD, macOS, " "and Windows." -msgstr "Ubuntu, Archlinux, FreeBSD, macOS 및 Windows를 비롯한 여러 플랫폼을 지원합니다." +msgstr "Ubuntu, FreeBSD, macOS 및 Windows를 비롯한 여러 플랫폼을 지원합니다." #: ../../overview.rst:25 ce0dc185f12a49cfb162dffa42518c2c msgid "Fully integrated with Gazebo." diff --git a/docs/readthedocs/overview.rst b/docs/readthedocs/overview.rst index b1ac86184a20b..7af87192ff96e 100644 --- a/docs/readthedocs/overview.rst +++ b/docs/readthedocs/overview.rst @@ -21,7 +21,7 @@ General ~~~~~~~ * Open-source C++ library licensed under the BSD license. -* Supports multiple platforms including Ubuntu, Archlinux, FreeBSD, macOS, and Windows. +* Supports multiple platforms including Ubuntu, FreeBSD, macOS, and Windows. * Fully integrated with Gazebo. * Supports models in URDF and SDF formats. * Provides default integration methods (semi-implicit Euler and RK4) and an extensible API for other numerical integration methods.