From fe5bf93e7d4e8c112d34e2e081cea549fb3ce600 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Tue, 5 Nov 2024 16:57:41 +0100 Subject: [PATCH 1/8] Raise a `FileNotFoundError` if the model path is not found --- python/icub_models/icub_models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/icub_models/icub_models.py b/python/icub_models/icub_models.py index 4a0906d..bfcef36 100644 --- a/python/icub_models/icub_models.py +++ b/python/icub_models/icub_models.py @@ -35,4 +35,4 @@ def get_model_file(robot_name: str) -> pathlib.Path: if model_file.is_file(): return model_file else: - return pathlib.Path("...") + raise FileNotFoundError(f"Model file for robot {robot_name} not found.") From e32c184c9085233efe6778dbf7c05d18b888a3a8 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Wed, 6 Nov 2024 10:43:24 +0100 Subject: [PATCH 2/8] Update `cxx-ci.yml` workflow to use latest action versions --- .github/workflows/cxx-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cxx-ci.yml b/.github/workflows/cxx-ci.yml index 569a4c3..c41dcc7 100644 --- a/.github/workflows/cxx-ci.yml +++ b/.github/workflows/cxx-ci.yml @@ -19,9 +19,9 @@ jobs: os: [ubuntu-20.04, macos-latest, windows-2019] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 with: miniforge-variant: Mambaforge miniforge-version: latest @@ -103,8 +103,8 @@ jobs: image: ${{ matrix.docker_image }} steps: - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 + # Print environment variables to simplify development and debugging - name: Environment Variables shell: bash @@ -125,7 +125,7 @@ jobs: mkdir -p build cd build cmake -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install .. - + - name: Build shell: bash run: | From 708c793df15016b83fa24e9d668f5822e6c64755 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Wed, 6 Nov 2024 10:44:15 +0100 Subject: [PATCH 3/8] Update `pip-ci.yml` workflow to use latest action versions --- .github/workflows/pip-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pip-ci.yml b/.github/workflows/pip-ci.yml index bede5ab..58bb723 100644 --- a/.github/workflows/pip-ci.yml +++ b/.github/workflows/pip-ci.yml @@ -19,10 +19,10 @@ jobs: os: [ubuntu-20.04, macos-latest, windows-2019] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} From 8573312dc065f27de476f191711f405a81c0def5 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Wed, 6 Nov 2024 10:44:22 +0100 Subject: [PATCH 4/8] Update `pypi-ci.yml` workflow to use latest action versions --- .github/workflows/pypi-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pypi-ci.yml b/.github/workflows/pypi-ci.yml index 84892c1..84b24e1 100644 --- a/.github/workflows/pypi-ci.yml +++ b/.github/workflows/pypi-ci.yml @@ -25,11 +25,11 @@ jobs: steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} @@ -40,7 +40,7 @@ jobs: run: python -m build --sdist --wheel --outdir dist/ . - name: Archive artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: dist path: dist @@ -53,13 +53,13 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: dist path: dist - name: Publish distribution 📦 to Test PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository_url: https://test.pypi.org/legacy/ @@ -72,12 +72,12 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: dist path: dist - name: Publish distribution 📦 to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_API_TOKEN }} From e52b8b32806a49800690984ccc9273806fa7c905 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Wed, 6 Nov 2024 10:44:44 +0100 Subject: [PATCH 5/8] Update `trigger_bru.yml` workflow to use latest action versions --- .github/workflows/trigger_bru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger_bru.yml b/.github/workflows/trigger_bru.yml index 959968d..efac476 100644 --- a/.github/workflows/trigger_bru.yml +++ b/.github/workflows/trigger_bru.yml @@ -57,7 +57,7 @@ jobs: repository: robotology/blender-robotics-utils - name: Repository dispatch to blender-robotics-utils - uses: peter-evans/repository-dispatch@v1 + uses: peter-evans/repository-dispatch@v3 if: steps.set_model_list.outputs.models != '' env: GITHUB_APPS_TOKEN: ${{ steps.get_workflow_token.outputs.token }} From 070d9d1079d6f1f59d4ab91d0fa3a7ac39016354 Mon Sep 17 00:00:00 2001 From: Alessandro Croci Date: Wed, 6 Nov 2024 11:50:24 +0100 Subject: [PATCH 6/8] Replace Mambaforge with Conda for package installation in `cxx-ci.yml` --- .github/workflows/cxx-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cxx-ci.yml b/.github/workflows/cxx-ci.yml index c41dcc7..346af27 100644 --- a/.github/workflows/cxx-ci.yml +++ b/.github/workflows/cxx-ci.yml @@ -23,7 +23,6 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: - miniforge-variant: Mambaforge miniforge-version: latest channels: conda-forge @@ -34,12 +33,12 @@ jobs: conda config --remove channels defaults # Build and test dependencies (ROS packages to test that resouces are find correctly by ROS/ROS2) # ros-noetic-catkin is required otherwised ROS_PACKAGE_PATH is not defined and rospack list does not return anything - mamba install -c conda-forge -c robostack -c robostack-humble cmake compilers make ninja pkg-config python ros-noetic-rospack ros-noetic-catkin ros-humble-ros2pkg + conda install -c conda-forge -c robostack -c robostack-humble cmake compilers make ninja pkg-config python ros-noetic-rospack ros-noetic-catkin ros-humble-ros2pkg - name: Print used environment [Conda] shell: bash -l {0} run: | - mamba list + conda list env - name: Configure [Conda/Linux&macOS] From c4832ec24947ab36e12cdc5bf52ddf6255a6c043 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 6 Nov 2024 13:31:28 +0100 Subject: [PATCH 7/8] Bump version to 2.8.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65e9e5a..8e5b693 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.8...3.16) project(icub-models - VERSION 2.8.0) + VERSION 2.8.1) include(GNUInstallDirs) From 7f72388e60ea44d5f90ea6948062af25b5c76e44 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 6 Nov 2024 13:31:57 +0100 Subject: [PATCH 8/8] Bump version to 2.8.1 --- iCub_manual/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iCub_manual/package.xml b/iCub_manual/package.xml index 3f7b013..9f7f398 100644 --- a/iCub_manual/package.xml +++ b/iCub_manual/package.xml @@ -1,6 +1,6 @@ iCub - 2.8.0 + 2.8.1 This is not an actual package, but rather a placeholder to make sure that the share/iCub directory is found as the