From 48ba71ce4bba991d24fffc0d825a98549aba7b1b Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Wed, 3 Nov 2021 09:49:02 -0700 Subject: [PATCH 1/5] Update all references to develop docker image tag to foxy-develop --- .circleci/config.yml | 2 +- Dockerfile | 2 +- hooks/pre_build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 088733d8..fb607ee5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: usdotfhwastoldev/carma-base:foxy-develop user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 5deedfbe..81a26c9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/carma-base:develop as base +FROM usdotfhwastoldev/carma-base:foxy-develop as base FROM base as setup RUN mkdir ~/src diff --git a/hooks/pre_build b/hooks/pre_build index 1b199017..17f6191c 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -2,12 +2,12 @@ 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]*|: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" \ + sed -i "s|checkout.bash|checkout.bash -d|g; s|usdotfhwastol/|usdotfhwastoldev/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:foxy-develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:foxy-develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:foxy-develop|g" \ Dockerfile elif [[ "$SOURCE_BRANCH" =~ ^release/.*$ ]]; then # swap checkout branch in checkout.bash to release branch RELEASE_NAME=$(echo $SOURCE_BRANCH | cut -d "/" -f 2) - sed -i "s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:develop|:$RELEASE_NAME|g" \ + sed -i "s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:foxy-develop|:$RELEASE_NAME|g" \ Dockerfile # swap checkout branch in checkout.bash to release branch sed -i "s|--branch .*|--branch $SOURCE_BRANCH|g" \ From e65727498530964b1142ea3aacac276b596081c9 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Wed, 3 Nov 2021 09:58:16 -0700 Subject: [PATCH 2/5] Update all references to develop branch to point to foxy/develop branch in build system --- docker/build-image.sh | 2 +- docker/checkout.bash | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/build-image.sh b/docker/build-image.sh index ed48c4f3..488bea44 100755 --- a/docker/build-image.sh +++ b/docker/build-image.sh @@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do ;; -d|--develop) USERNAME=usdotfhwastoldev - COMPONENT_VERSION_STRING=develop + COMPONENT_VERSION_STRING=foxy/develop shift ;; esac diff --git a/docker/checkout.bash b/docker/checkout.bash index 5a33389c..b94514f7 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]; do arg="$1" case $arg in -d|--develop) - BRANCH=develop + BRANCH=foxy/develop shift ;; -r|--root) @@ -39,6 +39,6 @@ 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 - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch foxy/develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch foxy/develop --depth 1 fi From aba048c765db7ed053da498da45ebfd93ba379fb Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Mon, 8 Nov 2021 13:19:55 -0800 Subject: [PATCH 3/5] Adding carma_cmake_common for combined ROS1/ROS2 workspace --- CMakeLists.txt | 3 +++ package.xml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index fac14719..15573f28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 2.8.3) project(avt_vimba_camera) +find_package(carma_cmake_common REQUIRED) +carma_check_ros_version(1) + find_package(catkin REQUIRED COMPONENTS #libvimba cav_msgs diff --git a/package.xml b/package.xml index e2c4cf7c..6f2afe69 100644 --- a/package.xml +++ b/package.xml @@ -32,6 +32,8 @@ image_proc stereo_image_proc + carma_cmake_common + From edcabe7110eea1a69570f93418814e1562ef25a6 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Wed, 17 Nov 2021 15:46:47 -0800 Subject: [PATCH 4/5] Fix typo in build-image.sh for foxy-develop tag --- docker/build-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/build-image.sh b/docker/build-image.sh index 488bea44..c268011b 100755 --- a/docker/build-image.sh +++ b/docker/build-image.sh @@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do ;; -d|--develop) USERNAME=usdotfhwastoldev - COMPONENT_VERSION_STRING=foxy/develop + COMPONENT_VERSION_STRING=foxy-develop shift ;; esac From 79248f3398a86c1756b45734d7075669c742c510 Mon Sep 17 00:00:00 2001 From: Michael McConnell Date: Tue, 8 Feb 2022 14:13:35 -0800 Subject: [PATCH 5/5] Revert references to foxy/develop --- .circleci/config.yml | 2 +- Dockerfile | 2 +- docker/build-image.sh | 2 +- docker/checkout.bash | 6 +++--- hooks/pre_build | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c3bacc2..1b4a264e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastoldev/carma-base:foxy-develop + - image: usdotfhwastoldev/carma-base:develop user: carma environment: TERM: xterm diff --git a/Dockerfile b/Dockerfile index 81a26c9d..5deedfbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -FROM usdotfhwastoldev/carma-base:foxy-develop as base +FROM usdotfhwastoldev/carma-base:develop as base FROM base as setup RUN mkdir ~/src diff --git a/docker/build-image.sh b/docker/build-image.sh index c268011b..ed48c4f3 100755 --- a/docker/build-image.sh +++ b/docker/build-image.sh @@ -41,7 +41,7 @@ while [[ $# -gt 0 ]]; do ;; -d|--develop) USERNAME=usdotfhwastoldev - COMPONENT_VERSION_STRING=foxy-develop + COMPONENT_VERSION_STRING=develop shift ;; esac diff --git a/docker/checkout.bash b/docker/checkout.bash index b94514f7..5a33389c 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -24,7 +24,7 @@ while [[ $# -gt 0 ]]; do arg="$1" case $arg in -d|--develop) - BRANCH=foxy/develop + BRANCH=develop shift ;; -r|--root) @@ -39,6 +39,6 @@ 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 - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch foxy/develop --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch foxy/develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch develop --depth 1 + git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch develop --depth 1 fi diff --git a/hooks/pre_build b/hooks/pre_build index 17f6191c..1b199017 100644 --- a/hooks/pre_build +++ b/hooks/pre_build @@ -2,12 +2,12 @@ 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]*|:foxy-develop|g s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:foxy-develop|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:foxy-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 RELEASE_NAME=$(echo $SOURCE_BRANCH | cut -d "/" -f 2) - sed -i "s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:foxy-develop|:$RELEASE_NAME|g" \ + sed -i "s|usdotfhwastol/|usdotfhwastolcandidate/|g; s|usdotfhwastoldev/|usdotfhwastolcandidate/|g; s|:[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:CARMA[a-zA-Z]*_[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:carma-[a-zA-Z]*-[0-9]*\.[0-9]*\.[0-9]*|:$RELEASE_NAME|g; s|:develop|:$RELEASE_NAME|g" \ Dockerfile # swap checkout branch in checkout.bash to release branch sed -i "s|--branch .*|--branch $SOURCE_BRANCH|g" \