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.

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

Merge release to develop for release 4.0.4 #177

Merged
merged 12 commits into from
Apr 26, 2022

Conversation

kjrush
Copy link
Contributor

@kjrush kjrush commented Apr 22, 2022

PR Details

Description

Merge PR to formalize release of feature/sync-develop-with-4.0.4-release into develop as part of CARMA release process for 4.0.4.

PR created automatically via CARMA release tool and Github CLI

Motivation and Context

This PR brings the tested and reviewed contents of the feature/sync-develop-with-4.0.4-release release/candidate into develop for final release preparation

How Has This Been Tested?

This release branch (minus final version number changes) has been tested through the CARMA verification test plan.

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    CARMA Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Dockerfile Outdated
@@ -14,7 +14,7 @@ LABEL org.label-schema.vcs-ref=${VCS_REF}
LABEL org.label-schema.build-date=${BUILD_DATE}

# Clone autoware repo to access messages
RUN cd /home/carma/ && git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-develop
RUN cd /home/carma/ && git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-system-4.0.3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop

Dockerfile Outdated

# Build the bridge
RUN source /opt/ros/noetic/setup.bash \
&& source /opt/ros/foxy/setup.bash \
&& source ~/.base-image/ros1_msgs_ws/install/local_setup.bash \
&& source ~/.base-image/ros2_msgs_ws/install/local_setup.bash \
&& cd ~/.base-image/workspace/src \
&& git clone --depth 1 --branch develop https://github.com/usdot-fhwa-stol/ros1_bridge.git \
&& git clone --depth 1 --branch carma-system-4.0.0 https://github.com/usdot-fhwa-stol/ros1_bridge.git \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop

@msmcconnell msmcconnell merged commit 0cf508f into develop Apr 26, 2022
@msmcconnell msmcconnell deleted the feature/sync-develop-with-4.0.4-release branch April 26, 2022 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants