Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into upstream-to-origin
Browse files Browse the repository at this point in the history
Signed-off-by: Yutaka Kondo <[email protected]>
  • Loading branch information
youtalk committed Jul 24, 2024
2 parents b8e7586 + 8979744 commit e95856e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/actions/docker-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
- name: Cache ccache
uses: actions/cache@v4
if: ${{ inputs.name == 'no-cuda' && github.ref == 'refs/heads/main' }}
id: cache-ccahce
id: cache-ccache
with:
path: |
root-ccache
Expand Down Expand Up @@ -107,4 +107,3 @@ runs:
push: false
build-args: ${{ inputs.build-args }}
cache-from: type=registry,ref=${{ github.repository }}-buildcache:${{ inputs.name }}-${{ inputs.platform }}-${{ inputs.cache-tag-suffix }}
cache-to: type=registry,ref=${{ github.repository }}-buildcache:${{ inputs.name }}-${{ inputs.platform }}-${{ inputs.cache-tag-suffix }},mode=max
4 changes: 4 additions & 0 deletions autoware.repos
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ repositories:
type: git
url: https://github.com/autowarefoundation/awsim_labs_sensor_kit_launch.git
version: main
sensor_kit/single_lidar_sensor_kit_launch:
type: git
url: https://github.com/autowarefoundation/single_lidar_sensor_kit_launch.git
version: main
# vehicle
vehicle/sample_vehicle_launch:
type: git
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Install development tools and artifacts
RUN --mount=type=ssh \
--mount=type=cache,target=/var/cache/apt,sharing=locked \
./setup-dev-env.sh -y --module dev-tools --download-artifacts openadkit \
./setup-dev-env.sh -y --module dev-tools openadkit \
&& pip uninstall -y ansible ansible-core \
&& apt-get autoremove -y && rm -rf "$HOME"/.cache

Expand Down

0 comments on commit e95856e

Please sign in to comment.