From d04123d143ca53e1fb1235387d45b1364ac9cf9e Mon Sep 17 00:00:00 2001
From: Alberto Tudela <ajtudela@gmail.com>
Date: Tue, 15 Oct 2024 14:22:03 +0200
Subject: [PATCH] Update CI

Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
---
 .github/{repos.repos => dependencies.repos} |  0
 .github/workflows/build.yml                 | 16 ++++++++++++----
 Dockerfile                                  |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)
 rename .github/{repos.repos => dependencies.repos} (100%)

diff --git a/.github/repos.repos b/.github/dependencies.repos
similarity index 100%
rename from .github/repos.repos
rename to .github/dependencies.repos
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9eafea..ed66863 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,20 +23,28 @@ jobs:
         with:
           packages: g++ cmake subversion doxygen libxml2-dev libssl-dev libsqlite3-dev libboost-all-dev libogre-1.9-dev libsvn-dev libopencv-dev binutils-dev libiberty-dev libcurl4-gnutls-dev libprocps-dev libqwt-qt5-dev libqt5webkit5-dev libqwtmathml-qt5-dev libqt5opengl5-dev libqt5svg5-dev qt*5-dev qttools5-dev-tools git
       - name: Cache MIRA
-        id: restore-mira-cache
+        id: cache-mira
         uses: actions/cache@v4
         with:
           path: ${{ env.MIRA_PATH }}
           key: mira-${{ runner.os }}-ubuntu-22.04
       - name: Install MIRA
-        if: steps.restore-mira-cache.outputs.cache-hit != 'true'
+        if: steps.cache-mira.outputs.cache-hit != 'true'
         run: | 
           curl -o mira-installer-binary.sh https://www.mira-project.org/downloads/mira-installer-binary.sh
           chmod +x mira-installer-binary.sh
           ./mira-installer-binary.sh -s ubuntu-2204lts-x64 -d ${{ env.MIRA_PATH }}
+      - 
   install-scitos2:
     runs-on: ubuntu-22.04
+    needs: install-mira
     steps:
+      - name: Restore MIRA cache
+        id: restore-cache-mira
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.MIRA_PATH }}
+          key: mira-${{ runner.os }}-ubuntu-22.04
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Cache
@@ -51,7 +59,7 @@ jobs:
         uses: ros-tooling/setup-ros@0.7.5
         with:
           required-ros-distributions: humble
-      - name: Install dependencies
+      - name: Build packages
         uses: ros-tooling/action-ros-ci@0.3.13
         with:
           package-name: |
@@ -64,7 +72,7 @@ jobs:
             scitos2_modules
             scitos2_msgs
           target-ros2-distro: humble
-          vcs-repo-file-url: ./.github/repos.repos
+          vcs-repo-file-url: ./.github/dependencies.repos
           colcon-defaults: |
             {
               "build": {
diff --git a/Dockerfile b/Dockerfile
index 446b8e5..aabefac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ RUN apt update && apt install --no-install-recommends -y \
     python3-vcstool \
     python3-colcon-clean \
     ros-$ROS_DISTRO-rmw-cyclonedds-cpp 
-RUN vcs import src < src/scitos2/.github/repos.repos
+RUN vcs import src < src/scitos2/.github/dependencies.repos
 RUN rosdep init && rosdep update
 RUN . /opt/ros/$ROS_DISTRO/setup.sh && \
     rosdep install -q -y --from-paths src --ignore-src --rosdistro $ROS_DISTRO && \