Skip to content

Commit

Permalink
Release 1.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
domire8 authored Aug 2, 2023
2 parents f17881f + 59e1b71 commit bf47b46
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 11 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,16 @@ jobs:
name: Build and publish (${{ matrix.arch }})
steps:
- uses: actions/checkout@v3
- uses: aica-technology/.github/.github/actions/ghcr-build@v0.5.0
- uses: aica-technology/.github/.github/actions/list-add-suffixes@v0.6.1
id: merge-tags
with:
list: ${{ needs.get-tag.outputs.tag }}
suffixes: ${{ matrix.arch }}
glue_separator: "-"
- uses: aica-technology/.github/.github/actions/ghcr-build@v0.6.1
with:
image_name: aica-technology/network-interfaces
image_tags: ${{ needs.get-tag.outputs.tag }}-${{ matrix.arch }}
image_tags: ${{ steps.merge-tags.outputs.list }}
dockerfile_path: Dockerfile.ci
token: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -45,7 +51,7 @@ jobs:
name: Merge into a multi-arch image
needs: [get-tag, build]
steps:
- uses: aica-technology/.github/.github/actions/ghcr-manifest-merge@v0.5.0
- uses: aica-technology/.github/.github/actions/ghcr-manifest-merge@v0.6.1
with:
image_name: aica-technology/network-interfaces
image_tags: ${{ needs.get-tag.outputs.tag }}
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Release Versions:

- [1.4.1](#141)
- [1.4.0](#140)
- [1.3.0](#130)
- [1.2.0](#120)
Expand All @@ -10,6 +11,10 @@ Release Versions:
- [0.2.0](#020)
- [0.1.0](#010)

## 1.4.1

Version 1.4.1 includes two fixes to the CI that are required downstream.

## 1.4.0

Version 1.4.0 includes a first stable version of communication interfaces.
Expand Down
13 changes: 8 additions & 5 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/aica-technology/ros2-modulo-control:humble as base
USER ${USER}

FROM base as apt-dependencies
RUN <<HEREDOC
Expand Down Expand Up @@ -52,19 +53,21 @@ xargs -a /tmp/new-packages.txt dpkg-query -L \
HEREDOC

FROM base as python
COPY --chown=${USER} ./python /python
COPY --chown=${USER}:${USER} ./python /python
RUN \
--mount=type=cache,target=${HOME}/.cache,id=pip-${TARGETPLATFORM},uid=1000 \
--mount=type=ssh,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 base as code
WORKDIR /src
COPY --from=apt-dependencies /tmp/apt /
COPY --chown=${USER} . /src
COPY --chown=${USER}:${USER} . /src

FROM code as development
COPY --from=python /tmp/python/local/lib/python3.10/dist-packages/ ${HOME}/.local/lib/python3.10/site-packages/
COPY --from=python /tmp/python-home/ /home

FROM code as build
RUN \
Expand All @@ -79,7 +82,7 @@ RUN \
--mount=type=ssh,uid=1000 \
cmake -B build -DBUILD_TESTING=ON \
&& CTEST_OUTPUT_ON_FAILURE=1 cmake --build build --target all test
COPY --from=python /tmp/python/local/lib/python3.10/dist-packages/ ${HOME}/.local/lib/python3.10/site-packages/
COPY --from=python /tmp/python-home/ /home
RUN python3 -m unittest discover python/test --verbose

FROM build as install
Expand All @@ -92,4 +95,4 @@ RUN \
FROM scratch as production
COPY --from=apt-dependencies /tmp/apt /
COPY --from=install /tmp/net-ifaces /usr/local
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 cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.15)

set (NETWORK_INTERFACES_VERSION 1.4.0)
set (NETWORK_INTERFACES_VERSION 1.4.1)
project(network_interfaces VERSION ${NETWORK_INTERFACES_VERSION})

option(BUILD_TESTING "Build tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setuptools.setup(
name="network_interfaces",
version="1.4.0",
version="1.4.1",
description="This package implements network interfaces of AICA",
maintainer="Dominic Reber",
maintainer_email="dominic@aica.tech",
Expand Down
2 changes: 1 addition & 1 deletion source/communication_interfaces/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.15)

set(COMMUNICATION_INTERFACES_VERSION 0.0.2)
set(COMMUNICATION_INTERFACES_VERSION 0.0.3)
project(communication_interfaces VERSION ${COMMUNICATION_INTERFACES_VERSION})

option(BUILD_TESTING "Build tests." OFF)
Expand Down

0 comments on commit bf47b46

Please sign in to comment.