diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa657ba..8251f82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,26 +49,16 @@ jobs: packages: libprocps-dev - name: Checkout Repository uses: actions/checkout@v4 - - name: Restore cache - uses: actions/cache@v4 - with: - path: ${{ github.workspace }} - key: scitos2-${{ runner.os }}-${{ github.sha }}-${{ github.run_id }} - restore-keys: | - scitos2-${{ runner.os }}-${{ github.sha }} - scitos2-${{ runner.os }} - name: Setup ROS 2 uses: ros-tooling/setup-ros@0.7.5 with: required-ros-distributions: humble - # - 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: Check ls - # run: ls -la ${{ github.workspace }} + - 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: Build packages env: MIRA_PATH: ${{ env.MIRA_PATH }} diff --git a/Dockerfile b/Dockerfile index aabefac..84c851e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN apt update && apt install --no-install-recommends -y \ ros-dev-tools \ python3-vcstool \ python3-colcon-clean \ - ros-$ROS_DISTRO-rmw-cyclonedds-cpp + ros-$ROS_DISTRO-rmw-cyclonedds-cpp RUN vcs import src < src/scitos2/.github/dependencies.repos RUN rosdep init && rosdep update RUN . /opt/ros/$ROS_DISTRO/setup.sh && \