From 1240962ebdd43ef099982dee3a1d77723643d06b Mon Sep 17 00:00:00 2001 From: Oguz Ozturk Date: Mon, 10 Feb 2025 13:28:19 +0300 Subject: [PATCH] apply changes Signed-off-by: Oguz Ozturk --- .../docker-build-and-push-tools/action.yaml | 29 ------------------- docker/tools/visualizer/Dockerfile.visualizer | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/.github/actions/docker-build-and-push-tools/action.yaml b/.github/actions/docker-build-and-push-tools/action.yaml index 3a318b4bd8..c3aa33e1ed 100644 --- a/.github/actions/docker-build-and-push-tools/action.yaml +++ b/.github/actions/docker-build-and-push-tools/action.yaml @@ -24,41 +24,12 @@ runs: - name: Run vcs import run: | - vcs import src < autoware.repos vcs import src < simulator.repos shell: bash - name: Setup Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Restore ccache - uses: actions/cache/restore@v4 - with: - path: | - root-ccache - key: ccache-${{ inputs.platform }}-${{ hashFiles('src/**/*.cpp') }} - restore-keys: | - ccache-${{ inputs.platform }}- - - - name: Restore apt-get - uses: actions/cache/restore@v4 - with: - path: | - var-cache-apt - key: apt-get-${{ inputs.platform }}-${{ hashFiles('src/**/package.xml') }} - restore-keys: | - apt-get-${{ inputs.platform }}- - - - name: Inject cache into docker - uses: reproducible-containers/buildkit-cache-dance@v3.1.2 - with: - cache-map: | - { - "root-ccache": "/root/.ccache", - "var-cache-apt": "/var/cache/apt" - } - skip-extraction: true - - name: Get current date id: date run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT diff --git a/docker/tools/visualizer/Dockerfile.visualizer b/docker/tools/visualizer/Dockerfile.visualizer index bcc03c94f5..dec2041ee1 100644 --- a/docker/tools/visualizer/Dockerfile.visualizer +++ b/docker/tools/visualizer/Dockerfile.visualizer @@ -31,7 +31,7 @@ RUN --mount=type=ssh \ # Extract rosdep dependencies for visualizer # hadolint ignore=SC1091 RUN source /opt/ros/"$ROS_DISTRO"/setup.bash && source /opt/autoware/setup.bash \ - && /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ + && /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} --dependency-types=exec \ > /rosdep-visualizer-depend-packages.txt \ && cat /rosdep-visualizer-depend-packages.txt