diff --git a/.github/actions/build-push/action.yml b/.github/actions/build-push/action.yml index a6fc7faaf..14f932088 100644 --- a/.github/actions/build-push/action.yml +++ b/.github/actions/build-push/action.yml @@ -45,12 +45,12 @@ runs: if [ "${{ inputs.base_tag }}" == "22.04" ]; then docker buildx build --file ${DOCKERFILE} \ --build-arg BASE_TAG=${{ inputs.base_tag }} \ - --platform=linux/arm64, linux/amd64 \ + --platform=linux/arm64,linux/amd64 \ --push -t ghcr.io/${IMAGE_NAME}:22.04 -t ghcr.io/${IMAGE_NAME}:latest . else docker buildx build --file ${DOCKERFILE} \ --build-arg BASE_TAG=${{ inputs.base_tag }} \ - --platform=linux/arm64, linux/amd64 \ + --platform=linux/arm64,linux/amd64 \ --push -t ghcr.io/${IMAGE_NAME}:20.04 . fi shell: bash diff --git a/CHANGELOG.md b/CHANGELOG.md index f351b1a38..8a91fb1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Release Versions: ## Upcoming changes (in development) -- Build and push both 20.04 and 22.04 images (#314) +- Build and push both 20.04 and 22.04 images (#314, #315) ## 6.2.0 diff --git a/VERSION b/VERSION index 024b066c0..ca0639438 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.2.1 +6.2.2 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index b46096bf6..4edb8f149 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 6.2.1 CONFIG REQUIRED) +find_package(control_libraries 6.2.2 CONFIG REQUIRED) set(DEMOS_SCRIPTS task_space_control_loop diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index 0df2cc367..55448e5b0 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 = 6.2.1 +PROJECT_NUMBER = 6.2.2 # 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 058939381..05769c1f7 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 6.2.1) +project(clproto VERSION 6.2.2) # Default to C99 if(NOT CMAKE_C_STANDARD) diff --git a/python/setup.py b/python/setup.py index 8b8321fd0..fd7dd6014 100644 --- a/python/setup.py +++ b/python/setup.py @@ -9,7 +9,7 @@ # names of the environment variables that define osqp and openrobots include directories osqp_path_var = 'OSQP_INCLUDE_DIR' -__version__ = "6.2.1" +__version__ = "6.2.2" __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model'] __include_dirs__ = ['include'] diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 5688954e4..7c10b83a9 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(control_libraries VERSION 6.2.1) +project(control_libraries VERSION 6.2.2) # Build options option(BUILD_TESTING "Build all tests." OFF)