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

Sync elise with master #77

Merged
merged 6 commits into from
Dec 7, 2021
Merged

Sync elise with master #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9852d9
updated config to point candidate for battista
SaikrishnaBairamoni Oct 24, 2021
52a3835
Updating version numbers for CARMA release 3.9.0
SaikrishnaBairamoni Dec 3, 2021
226bc28
Update config.yml
SaikrishnaBairamoni Dec 3, 2021
f8af5b7
Merge pull request #76 from usdot-fhwa-stol/release/battista
snallamothu Dec 4, 2021
2088273
Merge branch 'master' to release/elise
Dec 6, 2021
c924c86
Change noetic-develop back to develop for builds
Dec 6, 2021
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
4 changes: 2 additions & 2 deletions docker/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do
;;
-d|--develop)
USERNAME=usdotfhwastoldev
COMPONENT_VERSION_STRING=noetic-develop
COMPONENT_VERSION_STRING=develop
shift
;;
esac
Expand All @@ -55,7 +55,7 @@ echo "Building docker image for $IMAGE version: $COMPONENT_VERSION_STRING"
echo "Final image name: $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING"

cd ..
if [[ $COMPONENT_VERSION_STRING = "noetic-develop" ]]; then
if [[ $COMPONENT_VERSION_STRING = "develop" ]]; then
sed "s|usdotfhwastoldev/|$USERNAME/|g; s|usdotfhwastolcandidate/|$USERNAME/|g; s|usdotfhwastol/|$USERNAME/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$COMPONENT_VERSION_STRING|g; s|checkout.bash|checkout.bash -d|g" \
Dockerfile | docker build -f - --no-cache -t $USERNAME/$IMAGE:$COMPONENT_VERSION_STRING \
--build-arg VERSION="$COMPONENT_VERSION_STRING" \
Expand Down
4 changes: 2 additions & 2 deletions docker/checkout.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]; do
arg="$1"
case $arg in
-d|--develop)
BRANCH=noetic/develop
BRANCH=develop
shift
;;
-r|--root)
Expand All @@ -35,7 +35,7 @@ while [[ $# -gt 0 ]]; do
esac
done

if [[ "$BRANCH" = "noetic/develop" ]]; then
if [[ "$BRANCH" = "develop" ]]; then
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1
else
Expand Down
4 changes: 2 additions & 2 deletions hooks/pre_build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

if [[ "$SOURCE_BRANCH" = "noetic/develop" ]]; then
if [[ "$SOURCE_BRANCH" = "develop" ]]; then
# add -d flag to checkout.bash and update image dependencies
sed -i "s|checkout.bash|checkout.bash -d|g; s|usdotfhwastol/|usdotfhwastoldev/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:noetic-develop|g" \
sed -i "s|checkout.bash|checkout.bash -d|g; s|usdotfhwastol/|usdotfhwastoldev/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:develop|g" \
Dockerfile
elif [[ "$SOURCE_BRANCH" =~ ^release/.*$ ]]; then
# swap checkout branch in checkout.bash to release branch
Expand Down