Skip to content

Commit

Permalink
Merge release/k900-xil branch into master (#207)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->
This PR is to merge release branch into master for Xil release 4.4.3
# PR Details
## Description

<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

<!-- e.g. CAR-123 -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] 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**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
codygarver authored Jun 19, 2023
2 parents 8c8055d + 04247ce commit ba231e4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
build:
# Setup docker
docker:
- image: usdotfhwastol/carma-base:carma-system-4.4.0
- image: usdotfhwastol/carma-base:carma-system-4.4.3
user: carma
environment:
TERM: xterm # use xterm to get full display output from build
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM usdotfhwastol/carma-base:carma-system-4.4.0 as base_image
FROM usdotfhwastol/carma-base:carma-system-4.4.3 as base_image
SHELL ["/bin/bash", "-c"]

ARG DEBIAN_FRONTEND="noninteractive"
Expand Down
4 changes: 2 additions & 2 deletions docker/checkout.bash
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ cd ${dir}/src

if [[ "$BRANCH" = "develop" ]]; then
cd /home/carma/
git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch release/k900
git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-develop
cd ${dir}/src
git clone --depth 1 --branch carma-system-4.4.0 https://github.com/usdot-fhwa-stol/ros1_bridge.git
git clone --depth 1 --branch develop https://github.com/usdot-fhwa-stol/ros1_bridge.git
else
cd /home/carma/
git clone https://github.com/usdot-fhwa-stol/autoware.ai.git --depth 1 --branch carma-develop
Expand Down

0 comments on commit ba231e4

Please sign in to comment.