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

Jump to bottom

Merge release to develop for release 4.5.0 #24

Closed
wants to merge 3 commits into from
Closed

Merge release to develop for release 4.5.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4466cf1
update configs to point candidate images
SaikrishnaBairamoni Feb 9, 2024
ce2570f
Update version numbers to 4.5.0 (#23)
paulbourelly999 Apr 9, 2024
0cbe800
Merge release/lavida (4.5.0) branch into master (#22)
MishkaMN Apr 9, 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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Pull docker image from docker hub
# XTERM used for better catkin_make output
docker:
- image: usdotfhwastoldev/carma-base:develop
- image: usdotfhwastol/carma-base:carma-system-4.5.0
user: carma
environment:
TERM: xterm # use xterm to get full display output from build
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/dockerhub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ name: Docker Hub build
on:
push:
branches:
- "develop"
- develop
- master
- "release/*"
tags:
- "carma-system-*"

jobs:
dockerhub:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM usdotfhwastoldev/carma-base:develop as base_image
FROM usdotfhwastol/carma-base:carma-system-4.5.0 as base_image

FROM base_image as build

Expand Down
6 changes: 3 additions & 3 deletions docker/checkout.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if [[ "$BRANCH" = "develop" ]]; then
sudo git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH
sudo git clone https://github.com/usdot-fhwa-stol/autoware.ai.git ${dir}/src/autoware.ai --branch $BRANCH
else
sudo git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch develop
sudo git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch develop
sudo git clone https://github.com/usdot-fhwa-stol/autoware.ai.git ${dir}/src/autoware.ai --branch carma-develop
sudo git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.5.0
sudo git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.5.0
sudo git clone https://github.com/usdot-fhwa-stol/autoware.ai.git ${dir}/src/autoware.ai --branch carma-system-4.5.0
fi

sudo apt-get update
Expand Down
Loading