Skip to content

Commit

Permalink
release: patch v7.4.1 with docker image metadata (#191)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
eeberhard authored May 25, 2024
1 parent eddd9b7 commit 9cea932
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 24 deletions.
22 changes: 4 additions & 18 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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: "-"

Expand All @@ -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 }}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Release Versions

- [7.4.1](#741)
- [7.4.0](#740)
- [7.3.0](#730)
- [7.2.0](#720)
Expand All @@ -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.
Expand Down
5 changes: 5 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"}'
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.0
7.4.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.4.0 CONFIG REQUIRED)
find_package(control_libraries 7.4.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.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
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.4.0)
project(clproto VERSION 7.4.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.4.0"
__version__ = "7.4.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.4.0)
project(control_libraries VERSION 7.4.1)

# Build options
option(BUILD_TESTING "Build all tests." OFF)
Expand Down

0 comments on commit 9cea932

Please sign in to comment.