Skip to content
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
12 changes: 4 additions & 8 deletions .devcontainer/humble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc
# make sure folders exist
WORKDIR /home/$USERNAME/colcon_ws/src

RUN git clone https://github.com/CollaborativeRoboticsLab/capabilities2.git -b develop
# RUN git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
# RUN git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
# RUN git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git

# git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
# git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
# git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git
RUN git clone https://github.com/CollaborativeRoboticsLab/capabilities2.git
RUN git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
RUN git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
RUN git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git
12 changes: 4 additions & 8 deletions .devcontainer/jazzy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ RUN echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> ~/.bashrc
# make sure folders exist
WORKDIR /home/$USERNAME/colcon_ws/src

RUN git clone https://github.com/CollaborativeRoboticsLab/capabilities2.git -b develop
# RUN git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
# RUN git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
# RUN git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git

# git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
# git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
# git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git
RUN git clone https://github.com/CollaborativeRoboticsLab/capabilities2.git
RUN git clone --recurse-submodules https://github.com/CollaborativeRoboticsLab/prompt_tools.git
RUN git clone https://github.com/CollaborativeRoboticsLab/prompt_capabilities.git
RUN git clone https://github.com/CollaborativeRoboticsLab/fabric_capabilities.git
57 changes: 57 additions & 0 deletions .github/workflows/doxygen-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
paths:
- Doxygen
- README.md
- '**/package.xml'
- docs/**
- '**/*.md'
- '**/*.dox'
Expand All @@ -26,6 +27,7 @@ on:
paths:
- Doxygen
- README.md
- '**/package.xml'
- docs/**
- '**/*.md'
- '**/*.dox'
Expand Down Expand Up @@ -58,6 +60,61 @@ jobs:
- name: Check out repository
uses: actions/checkout@v4

- name: Check package versions
run: |
python3 <<'PY'
import re
import sys
import xml.etree.ElementTree as ET
from pathlib import Path

root = Path('.')
package_files = sorted(root.glob('**/package.xml'))

if not package_files:
print('No package.xml files found.')
sys.exit(1)

versions = {}
invalid = []
semver_re = re.compile(r'^\d+\.\d+\.\d+$')

for pkg_file in package_files:
tree = ET.parse(pkg_file)
package = tree.getroot()
name = package.findtext('name', '').strip()
version = package.findtext('version', '').strip()

if not name or not version:
invalid.append((str(pkg_file), name or '<missing name>', version or '<missing version>'))
continue

if not semver_re.match(version):
invalid.append((str(pkg_file), name, version))
continue

versions[name] = version

if invalid:
print('Invalid package metadata found:')
for path, name, version in invalid:
print(f' - {path}: name={name}, version={version}')
sys.exit(1)

unique_versions = sorted(set(versions.values()))

print('Discovered package versions:')
for name, version in sorted(versions.items()):
print(f' - {name}: {version}')

if len(unique_versions) != 1:
print('\nVersion mismatch detected across package.xml files.')
print('Unique versions found:', ', '.join(unique_versions))
sys.exit(1)

print(f'\nAll package.xml files use version {unique_versions[0]}.')
PY

- name: Install Doxygen
run: sudo apt-get update && sudo apt-get install -y doxygen

Expand Down
15 changes: 0 additions & 15 deletions docs/readme.md

This file was deleted.

11 changes: 9 additions & 2 deletions fabric_base/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
<package format="3">
<name>fabric_base</name>
<version>0.2.0</version>
<description>TODO: Package description</description>
<maintainer email="kalanaratnayake95@gmail.com">ubuntu</maintainer>

<description>Shared base utilities and plugin interfaces for the Fabric stack.</description>

<maintainer email="kalanaratnayake95@gmail.com">Kalana Ratnayake</maintainer>
<maintainer email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</maintainer>

<author email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</author>
<author email="kalanaratnayake95@gmail.com">Kalana Ratnayake</author>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
3 changes: 2 additions & 1 deletion fabric_msgs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
</description>

<maintainer email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</maintainer>
<maintainer email="kalanaratnayake@gmail.com">Kalana Ratnayake</maintainer>
<maintainer email="kalanaratnayake95@gmail.com">Kalana Ratnayake</maintainer>

<author email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</author>
<author email="kalanaratnayake95@gmail.com">Kalana Ratnayake</author>

<license>MIT</license>

Expand Down
10 changes: 8 additions & 2 deletions fabric_parser_xml/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
<package format="3">
<name>fabric_parser_xml</name>
<version>0.2.0</version>
<description>TODO: Package description</description>
<maintainer email="kalanaratnayake95@gmail.com">ubuntu</maintainer>
<description>XML parser plugins for Fabric execution plans.</description>

<maintainer email="kalanaratnayake95@gmail.com">Kalana Ratnayake</maintainer>
<maintainer email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</maintainer>

<author email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</author>
<author email="kalanaratnayake95@gmail.com">Kalana Ratnayake</author>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
10 changes: 8 additions & 2 deletions fabric_server/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
<package format="3">
<name>fabric_server</name>
<version>0.2.0</version>
<description>TODO: Package description</description>
<maintainer email="kalanaratnayake95@gmail.com">ubuntu</maintainer>
<description>Server package for coordinating capability execution in the Fabric stack.</description>

<maintainer email="kalanaratnayake95@gmail.com">Kalana Ratnayake</maintainer>
<maintainer email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</maintainer>

<author email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</author>
<author email="kalanaratnayake95@gmail.com">Kalana Ratnayake</author>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
10 changes: 8 additions & 2 deletions fabric_validator/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
<package format="3">
<name>fabric_validator</name>
<version>0.2.0</version>
<description>TODO: Package description</description>
<maintainer email="kalanaratnayake95@gmail.com">ubuntu</maintainer>
<description>Validation plugins for Fabric execution plans.</description>

<maintainer email="kalanaratnayake95@gmail.com">Kalana Ratnayake</maintainer>
<maintainer email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</maintainer>

<author email="kalana.ratnayakemudiyanselage@canberra.edu.au">Kalana Ratnayake</author>
<author email="kalanaratnayake95@gmail.com">Kalana Ratnayake</author>

<license>MIT</license>

<buildtool_depend>ament_cmake</buildtool_depend>
Expand Down
Loading