From 4f8f6b0d6ab54b235bdb4571d27ca91037ef78c8 Mon Sep 17 00:00:00 2001 From: Dominic Reber <71256590+domire8@users.noreply.github.com> Date: Tue, 25 Jul 2023 16:13:57 +0200 Subject: [PATCH 1/3] Release Version 7.1.0 (#129) --- CHANGELOG.md | 8 +++++++- VERSION | 2 +- demos/CMakeLists.txt | 2 +- doxygen/doxygen.conf | 2 +- protocol/clproto_cpp/CMakeLists.txt | 2 +- python/setup.py | 2 +- source/CMakeLists.txt | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed62901c5..c73870e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ # CHANGELOG Release Versions: +- [7.1.0](#710) - [7.0.0](#700) - [6.3.1](#631) - [6.3.0](#630) - [6.2.0](#620) -## Upcoming changes (in development) +## 7.1.0 + +Version 7.1.0 contains behind-the-scenes structural improvements to the build system and the CI as well as a few +minor improvements and fixes to state_representation. + +### Full changelog: - Update push hooks in build-release.yaml (#127) - feat(ci): add prebuilt control-libraries image akin to network-interfaces (#125) diff --git a/VERSION b/VERSION index 2be8aeb6b..a3fcc7121 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.5 +7.1.0 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 9fbef876f..ecba6e578 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -15,7 +15,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) endif() -find_package(control_libraries 7.0.5 CONFIG REQUIRED) +find_package(control_libraries 7.1.0 CONFIG REQUIRED) set(DEMOS_SCRIPTS task_space_control_loop diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 806d91508..0b64c1ccf 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -38,7 +38,7 @@ PROJECT_NAME = "Control Libraries" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 7.0.5 +PROJECT_NUMBER = 7.1.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/protocol/clproto_cpp/CMakeLists.txt b/protocol/clproto_cpp/CMakeLists.txt index 82a85e165..32ef2a932 100644 --- a/protocol/clproto_cpp/CMakeLists.txt +++ b/protocol/clproto_cpp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(clproto VERSION 7.0.5) +project(clproto VERSION 7.1.0) # Default to C99 if(NOT CMAKE_C_STANDARD) diff --git a/python/setup.py b/python/setup.py index b8e163654..c5d712368 100644 --- a/python/setup.py +++ b/python/setup.py @@ -11,7 +11,7 @@ # names of the environment variables that define osqp and openrobots include directories osqp_path_var = 'OSQP_INCLUDE_DIR' -__version__ = "7.0.5" +__version__ = "7.1.0" __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model'] __include_dirs__ = ['include'] diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 946fe77b2..9ddf65ed6 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(control_libraries VERSION 7.0.5) +project(control_libraries VERSION 7.1.0) # Build options option(BUILD_TESTING "Build all tests." OFF) From 09f6fb612e2f4e30885febf1e9aa6f5ba40c8f4c Mon Sep 17 00:00:00 2001 From: Louis Brunner Date: Mon, 7 Aug 2023 10:20:13 +0200 Subject: [PATCH 2/3] fix(ci): fix permissions on HOME (#130) --- Dockerfile.ci | 10 +++++++--- VERSION | 2 +- demos/CMakeLists.txt | 2 +- doxygen/doxygen.conf | 2 +- protocol/clproto_cpp/CMakeLists.txt | 2 +- python/setup.py | 2 +- source/CMakeLists.txt | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index 3e2fe9c07..4e0f894d7 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1,4 +1,6 @@ FROM ghcr.io/aica-technology/ros2-ws:humble as base +USER ${USER} + FROM base as apt-dependencies COPY apt-packages.tx[t] / @@ -96,7 +98,7 @@ FROM base as code WORKDIR /src COPY --from=apt-dependencies /tmp/apt / COPY --from=dependencies /tmp/deps /usr -COPY --chown=${USER} . /src +COPY --chown=${USER}:${USER} . /src FROM code as build RUN \ @@ -116,14 +118,16 @@ RUN \ cmake --install build --prefix /tmp/cl FROM base as python -COPY --chown=${USER} ./python /python +COPY --chown=${USER}:${USER} ./python /python COPY --from=install /tmp/cl /usr RUN \ --mount=type=cache,target=${HOME}/.cache,id=pip-${TARGETPLATFORM},uid=1000 \ python3 -m pip install --prefix=/tmp/python /python +RUN mkdir -p /tmp/python-home/${USER}/.local/lib/python3.10/ \ + && mv /tmp/python/local/lib/python3.10/dist-packages/ /tmp/python-home/${USER}/.local/lib/python3.10/site-packages/ FROM scratch COPY --from=apt-dependencies /tmp/apt / COPY --from=dependencies /tmp/deps /usr COPY --from=install /tmp/cl /usr -COPY --from=python /tmp/python/local/lib/python3.10/dist-packages/ /home/ros2/.local/lib/python3.10/site-packages/ +COPY --from=python /tmp/python-home /home diff --git a/VERSION b/VERSION index a3fcc7121..21c8c7b46 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.1.0 +7.1.1 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index ecba6e578..77089364c 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -15,7 +15,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) endif() -find_package(control_libraries 7.1.0 CONFIG REQUIRED) +find_package(control_libraries 7.1.1 CONFIG REQUIRED) set(DEMOS_SCRIPTS task_space_control_loop diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 0b64c1ccf..f26cb5767 100644 --- a/doxygen/doxygen.conf +++ b/doxygen/doxygen.conf @@ -38,7 +38,7 @@ PROJECT_NAME = "Control Libraries" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 7.1.0 +PROJECT_NUMBER = 7.1.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/protocol/clproto_cpp/CMakeLists.txt b/protocol/clproto_cpp/CMakeLists.txt index 32ef2a932..012a7b01c 100644 --- a/protocol/clproto_cpp/CMakeLists.txt +++ b/protocol/clproto_cpp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(clproto VERSION 7.1.0) +project(clproto VERSION 7.1.1) # Default to C99 if(NOT CMAKE_C_STANDARD) diff --git a/python/setup.py b/python/setup.py index c5d712368..d98a17e64 100644 --- a/python/setup.py +++ b/python/setup.py @@ -11,7 +11,7 @@ # names of the environment variables that define osqp and openrobots include directories osqp_path_var = 'OSQP_INCLUDE_DIR' -__version__ = "7.1.0" +__version__ = "7.1.1" __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model'] __include_dirs__ = ['include'] diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 9ddf65ed6..e2850ca99 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(control_libraries VERSION 7.1.0) +project(control_libraries VERSION 7.1.1) # Build options option(BUILD_TESTING "Build all tests." OFF) From ba36ec0c7b0051ee8df84619b8a99892cc3384b9 Mon Sep 17 00:00:00 2001 From: Dominic Reber Date: Mon, 11 Sep 2023 13:09:29 +0200 Subject: [PATCH 3/3] Release Version 7.1.1 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c73870e25..458cf1f22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,17 @@ # CHANGELOG Release Versions: +- [7.1.1](#711) - [7.1.0](#710) - [7.0.0](#700) - [6.3.1](#631) - [6.3.0](#630) - [6.2.0](#620) +## 7.1.1 + +Version 7.1.1 contains one commit to fix permissions of the home folder in the generated Docker images. + ## 7.1.0 Version 7.1.0 contains behind-the-scenes structural improvements to the build system and the CI as well as a few