Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(autoware.repos): fix autoware.universe and autoware_launch versions to 0.38.0 #5435

Closed
wants to merge 17 commits into from
Closed

chore(autoware.repos): fix autoware.universe and autoware_launch versions to 0.38.0 #5435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
55d0ab6
fix version to 0.38.0
youtalk Nov 14, 2024
6cdbe02
revert cuda_utils
youtalk Nov 14, 2024
0910f19
wip
youtalk Nov 14, 2024
981956c
wip
youtalk Nov 14, 2024
87fb103
wip
youtalk Nov 14, 2024
736ea65
Revert "wip"
youtalk Nov 15, 2024
f0132de
Revert "fix: remove `ndt_omp` (#5390)"
youtalk Nov 15, 2024
03a1033
add autoware-nightly.repos
youtalk Nov 15, 2024
ef98907
add health-check-nightly
youtalk Nov 15, 2024
30857f6
fix inputs
youtalk Nov 15, 2024
df72d69
rename
youtalk Nov 15, 2024
3746713
Merge branch 'autoware-nightly' into universe-launch-versioning
youtalk Nov 15, 2024
a7bf538
Merge remote-tracking branch 'upstream/main' into universe-launch-ver…
youtalk Nov 19, 2024
9cb0c7a
comment
youtalk Nov 19, 2024
05bf0bc
Revert "fix(docker): add autoware prefix to map_loader (#5451)"
youtalk Nov 19, 2024
18a37ff
Merge branch 'main' into universe-launch-versioning
youtalk Nov 21, 2024
b7b0484
Merge branch 'main' into universe-launch-versioning
youtalk Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions autoware.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ repositories:
universe/autoware.universe:
type: git
url: https://github.com/autowarefoundation/autoware.universe.git
version: main
version: 0.38.0
universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Migrate to AD API and remove this repository entry.
type: git
url: https://github.com/tier4/tier4_ad_api_adaptor.git
version: tier4/universe
# TODO(youtalk): Use version tag instead
version: 3de19bc5b554d4cecef2240da3c33434379ccb54
universe/external/tier4_autoware_msgs:
type: git
url: https://github.com/tier4/tier4_autoware_msgs.git
Expand All @@ -55,6 +56,10 @@ repositories:
type: git
url: https://github.com/tier4/muSSP.git
version: tier4/main
universe/external/ndt_omp:
type: git
url: https://github.com/tier4/ndt_omp.git
version: tier4/main
universe/external/pointcloud_to_laserscan:
type: git
url: https://github.com/tier4/pointcloud_to_laserscan.git
Expand All @@ -79,7 +84,7 @@ repositories:
launcher/autoware_launch:
type: git
url: https://github.com/autowarefoundation/autoware_launch.git
version: main
version: 0.38.0
# sensor_component
sensor_component/external/sensor_component_description:
type: git
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# hadolint ignore=DL3006
FROM $BASE_IMAGE AS base

Check warning on line 4 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

Default value for global ARG results in an empty or invalid base image name 

InvalidDefaultArgInFrom: Default value for ARG $BASE_IMAGE results in empty or invalid base image name
More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG ROS_DISTRO

Expand Down Expand Up @@ -50,7 +50,7 @@
&& /autoware/cleanup_apt.sh true

# hadolint ignore=DL3006
FROM $BASE_IMAGE AS rosdep-depend

Check warning on line 53 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

Default value for global ARG results in an empty or invalid base image name 

InvalidDefaultArgInFrom: Default value for ARG $BASE_IMAGE results in empty or invalid base image name
More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG ROS_DISTRO

Expand Down Expand Up @@ -115,7 +115,7 @@
COPY src/universe/autoware.universe/control /autoware/src/universe/autoware.universe/control
COPY src/universe/autoware.universe/planning /autoware/src/universe/autoware.universe/planning
# TODO(youtalk): Remove COPYs when https://github.com/autowarefoundation/autoware.universe/issues/8805 is resolved
COPY src/universe/autoware.universe/map/autoware_map_loader /autoware/src/universe/autoware.universe/map/autoware_map_loader
COPY src/universe/autoware.universe/map/map_loader /autoware/src/universe/autoware.universe/map/map_loader
COPY src/universe/autoware.universe/map/autoware_map_projection_loader /autoware/src/universe/autoware.universe/map/autoware_map_projection_loader
COPY src/universe/autoware.universe/sensing/autoware_pcl_extensions /autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions
COPY src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor /autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor
Expand Down Expand Up @@ -322,7 +322,7 @@
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/control,target=/autoware/src/universe/autoware.universe/control \
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/planning,target=/autoware/src/universe/autoware.universe/planning \
# TODO(youtalk): Remove --mount options when https://github.com/autowarefoundation/autoware.universe/issues/8805 is resolved
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/map/autoware_map_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_loader \
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/map/map_loader,target=/autoware/src/universe/autoware.universe/map/map_loader \
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/map/autoware_map_projection_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_projection_loader \
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions,target=/autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions \
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor,target=/autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor \
Expand Down
Loading