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

Merge release/a1 branch to master for 3.8.0 #71

Merged
merged 4 commits into from
Sep 25, 2021
Merged

Merge release/a1 branch to master for 3.8.0 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
334aa24
update config files to point dev from 3.7
SaikrishnaBairamoni Aug 12, 2021
5f44cbe
Merge pull request #69 from usdot-fhwa-stol/sync_develop_with_3_7
msmcconnell Aug 13, 2021
b2050d2
update config and Dockerfile for release a1
SaikrishnaBairamoni Sep 2, 2021
36bc1d7
updated dockerfile and config file to point 3.8.0
SaikrishnaBairamoni Sep 24, 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
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: usdotfhwastol/carma-base:carma-system-3.7.0
- image: usdotfhwastol/carma-base:carma-system-3.8.0
user: carma
environment:
TERM: xterm
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations under
# the License.

FROM usdotfhwastol/carma-base:carma-system-3.7.0 as base
FROM usdotfhwastol/carma-base:carma-system-3.8.0 as base
FROM base as setup

RUN mkdir ~/src
Expand Down
8 changes: 4 additions & 4 deletions docker/checkout.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch carma-system-3.8.0 --depth 1
else
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.7.0 --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.7.0 --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-3.8.0 --depth 1
git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-3.8.0 --depth 1
fi