From 9cea932b160eda6a1f293b6aa0833f653b4daad1 Mon Sep 17 00:00:00 2001 From: Enrico Eberhard <32450951+eeberhard@users.noreply.github.com> Date: Sat, 25 May 2024 21:37:55 +0200 Subject: [PATCH] release: patch v7.4.1 with docker image metadata (#191) * 7.4.0 -> 7.4.1 * build: add docker image metadata * ci: build on branch patch/v7.4.1 and remove other workflow triggers * hardcode tag for v7.4.1 * CHANGELOG --- .github/workflows/build-release.yaml | 22 ++++------------------ CHANGELOG.md | 7 +++++++ Dockerfile | 5 +++++ VERSION | 2 +- demos/CMakeLists.txt | 2 +- doxygen/doxygen.conf | 2 +- protocol/clproto_cpp/CMakeLists.txt | 2 +- python/setup.py | 2 +- source/CMakeLists.txt | 2 +- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index 95ec0513f..2d6d3140b 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -3,24 +3,10 @@ name: Build and Push Multi-Arch Images on: push: branches: - - develop - - main - tags: - - "v*.*.*" + - patch/v7.4.1 jobs: - get-tag: - runs-on: ubuntu-latest - name: Get tag - outputs: - tag: ${{ steps.parse-tag.outputs.tag }} - steps: - - uses: actions/checkout@v3 - - uses: aica-technology/.github/.github/actions/docker-tag-from-git@v0.6.1 - id: parse-tag - build: - needs: [get-tag] strategy: matrix: arch: [amd64, arm64] @@ -38,7 +24,7 @@ jobs: - uses: aica-technology/.github/.github/actions/list-add-suffixes@v0.6.1 id: merge-tags with: - list: ${{ needs.get-tag.outputs.tag }} + list: v7.4.1 suffixes: ${{ matrix.arch }} glue_separator: "-" @@ -52,11 +38,11 @@ jobs: multi-arch: runs-on: ubuntu-latest name: Merge into a multi-arch image - needs: [get-tag, build] + needs: [build] steps: - uses: aica-technology/.github/.github/actions/ghcr-manifest-merge@v0.6.1 with: image_name: aica-technology/control-libraries - image_tags: ${{ needs.get-tag.outputs.tag }} + image_tags: v7.4.1 archs: amd64,arm64 token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 52b1e281c..30431f04c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Release Versions +- [7.4.1](#741) - [7.4.0](#740) - [7.3.0](#730) - [7.2.0](#720) @@ -12,6 +13,12 @@ Release Versions - [6.3.0](#630) - [6.2.0](#620) + +## 7.4.1 + +Version 7.4.1 is a retro-active patch that adds metadata to the final control-libraries Docker image required +for aica-technology/package-builder:v1. + ## 7.4.0 Version 7.4.0 brings Analog and Digital IO State types as a new feature to the `state_representation` module. diff --git a/Dockerfile b/Dockerfile index 566edfc87..14676b7b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -224,3 +224,8 @@ COPY --from=dependencies /tmp/deps /usr COPY --from=install /tmp/cl /usr COPY --from=python /tmp/python-usr /usr COPY --from=python-stubs /tmp/python-usr /usr + +LABEL org.opencontainers.image.title="AICA control-libraries" +LABEL org.opencontainers.image.description="AICA control libraries" +LABEL org.opencontainers.image.version="v7.4.1" +LABEL tech.aica.image.metadata='{"type":"lib"}' diff --git a/VERSION b/VERSION index ba7f754d0..815da58b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.4.0 +7.4.1 diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 881cc7b8c..de7227734 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.4.0 CONFIG REQUIRED) +find_package(control_libraries 7.4.1 CONFIG REQUIRED) set(DEMOS_SCRIPTS task_space_control_loop diff --git a/doxygen/doxygen.conf b/doxygen/doxygen.conf index f6f166a8b..1a9812c80 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.4.0 +PROJECT_NUMBER = 7.4.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 7dc87086f..1bb3d4367 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.4.0) +project(clproto VERSION 7.4.1) # Default to C99 if(NOT CMAKE_C_STANDARD) diff --git a/python/setup.py b/python/setup.py index 76c455e9e..4abfee433 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.4.0" +__version__ = "7.4.1" __libraries__ = ['state_representation', 'clproto', 'controllers', 'dynamical_systems', 'robot_model'] __include_dirs__ = ['include'] diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index cd71d8588..3922fc3ed 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.15) -project(control_libraries VERSION 7.4.0) +project(control_libraries VERSION 7.4.1) # Build options option(BUILD_TESTING "Build all tests." OFF)