Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: create git tag on release #109

Merged
merged 3 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,8 @@ jobs:
image_tags: ${{ needs.metadata.outputs.image_tags }}
archs: amd64,arm64
token: ${{ secrets.GITHUB_TOKEN }}

- if: needs.metadata.outputs.create_tag == 'true'
uses: aica-technology/.github/.github/actions/git-tag@v0.8.1
with:
tag: ${{ needs.metadata.outputs.git_tag }}
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

Release Versions:

- [4.2.1](#421)
- [4.2.0](#420)
- [4.1.0](#410)
- [4.0.0](#400)
Expand All @@ -13,6 +14,15 @@ Release Versions:
- [2.1.1](#211)
- [2.1.0](#210)

## 4.2.1

### May 29, 2024

Version 4.2.1 is a patch that fixes a missing version update in the aica-package.toml and a missing action in the
build-release workflow.

- ci: create git tag on release (#109)

## 4.2.0

### May 28, 2024
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.0
4.2.1
2 changes: 1 addition & 1 deletion aica-package.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#syntax=ghcr.io/aica-technology/package-builder:v1

[metadata]
version = "4.1.0"
version = "4.2.1"
description = "Modular ROS 2 extension library for dynamic composition of components and controllers with the AICA robotics framework"

[metadata.collection]
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 = "Modulo"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 4.2.0
PROJECT_NUMBER = 4.2.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 source/modulo_component_interfaces/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_component_interfaces</name>
<version>4.2.0</version>
<version>4.2.1</version>
<description>Interface package for communicating with modulo components through the ROS framework</description>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
<license>GPLv3</license>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_components/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_components</name>
<version>4.2.0</version>
<version>4.2.1</version>
<description>Modulo base classes that wrap ROS2 Nodes as modular components for the AICA application framework</description>
<maintainer email="baptiste@aica.tech">Baptiste Busch</maintainer>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_controllers/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="3">
<name>modulo_controllers</name>
<version>4.2.0</version>
<version>4.2.1</version>
<description>Interface class for modulo controllers</description>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
<maintainer email="dominic@aica.tech">Dominic Reber</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_core/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_core</name>
<version>4.2.0</version>
<version>4.2.1</version>
<description>Modulo Core communication and translation utilities for interoperability with AICA Control Libraries</description>
<maintainer email="baptiste@aica.tech">Baptiste Busch</maintainer>
<maintainer email="enrico@aica.tech">Enrico Eberhard</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion source/modulo_utils/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>modulo_utils</name>
<version>4.2.0</version>
<version>4.2.1</version>
<description>Modulo utils package for shared test fixtures</description>
<maintainer email="dominic@aica.tech">Dominic Reber</maintainer>
<license>GPLv3</license>
Expand Down
7 changes: 6 additions & 1 deletion update_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ This script modifies the version in the following files:
./source/modulo_interfaces/package.xml
./source/modulo_utils/package.xml
./doxygen/doxygen.conf
./aica-package.toml
./VERSION

Options:
Expand Down Expand Up @@ -111,6 +112,7 @@ fi
SED_STR_VERSION="s/${VERSION}/${NEW_VERSION}/g"
SED_STR_PACKAGE="s/<version>${VERSION}<\/version>/<version>${NEW_VERSION}<\/version>/g"
SED_STR_DOXYGEN="s/PROJECT_NUMBER = ${VERSION}/PROJECT_NUMBER = ${NEW_VERSION}/g"
SED_STR_TOML="s/version = \"${VERSION}\"/version = \"${NEW_VERSION}\"/g"
domire8 marked this conversation as resolved.
Show resolved Hide resolved

if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' "${SED_STR_PACKAGE}" ./source/modulo_component_interfaces/package.xml
Expand All @@ -120,6 +122,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
sed -i '' "${SED_STR_PACKAGE}" ./source/modulo_interfaces/package.xml
sed -i '' "${SED_STR_PACKAGE}" ./source/modulo_utils/package.xml
sed -i '' "${SED_STR_DOXYGEN}" ./doxygen/doxygen.conf
sed -i '' "${SED_STR_TOML}" ./aica-package.toml
sed -i '' "${SED_STR_VERSION}" ./VERSION
else
sed -i "${SED_STR_PACKAGE}" ./source/modulo_component_interfaces/package.xml
Expand All @@ -129,13 +132,15 @@ else
sed -i "${SED_STR_PACKAGE}" ./source/modulo_interfaces/package.xml
sed -i "${SED_STR_PACKAGE}" ./source/modulo_utils/package.xml
sed -i "${SED_STR_DOXYGEN}" ./doxygen/doxygen.conf
sed -i "${SED_STR_TOML}" ./aica-package.toml
sed -i "${SED_STR_VERSION}" ./VERSION
fi

if [ "${COMMIT}" == true ]; then
echo "Committing changes to source control"
git add ./source/modulo_component_interfaces/package.xml ./source/modulo_components/package.xml \
./source/modulo_controllers/package.xml ./source/modulo_core/package.xml \
./source/modulo_interfaces/package.xml ./source/modulo_utils/package.xml ./doxygen/doxygen.conf VERSION
./source/modulo_interfaces/package.xml ./source/modulo_utils/package.xml \
./doxygen/doxygen.conf aica-package.toml VERSION
git commit -m "${VERSION} -> ${NEW_VERSION}"
fi
Loading