Merge release/a1 branch to master for 3.8.0 #71
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Kudos, SonarCloud Quality Gate passed!
|
kjrush
reviewed
Sep 24, 2021
| @@ -36,9 +36,9 @@ while [[ $# -gt 0 ]]; do | |||
| done | |||
|
|
|||
| if [[ "$BRANCH" = "develop" ]]; then | |||
| git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.7.0 --depth 1 | |||
| git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.7.0 --depth 1 | |||
| git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch carma-system-3.8.0 --depth 1 | |||
There was a problem hiding this comment.
Should these be develop branch? I think this is needed for the develop builds right? Will it cause a merge conflict when we merge back to develop after release?
kjrush
requested changes
Sep 24, 2021
kjrush
approved these changes
Sep 24, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Details
Merge release/a1 branch to master for 3.8.0
Description
Related Issue
Motivation and Context
How Has This Been Tested?
Types of changes
Checklist:
CARMA Contributing Guide