Skip to content

Commit

Permalink
Release Version 7.1.1
Browse files Browse the repository at this point in the history
Version 7.1.1 contains one commit to fix permissions of the home folder in the generated Docker images
  • Loading branch information
domire8 authored Sep 11, 2023
2 parents 7da0c99 + 3eb6394 commit 1420f6e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 7 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -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] /

Expand Down Expand Up @@ -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 \
Expand All @@ -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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.1.0
7.1.1
2 changes: 1 addition & 1 deletion demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doxygen/doxygen.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion protocol/clproto_cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion source/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 1420f6e

Please sign in to comment.