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.

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

Use maliput::test_utilities and try same branch name in actions #24

Merged
merged 2 commits into from
Nov 24, 2020

Conversation

scpeters
Copy link
Contributor

This is a companion to maliput/maliput#368 (use updated target name maliput::test_utilities) and based on maliput/maliput_dragway#18. The workflow fails when compiled against the master branch of maliput, so I've also added support for checking out matching branch names of package dependencies in GitHub actions workflows, as discussed in maliput/maliput_infrastructure#136 (comment). The code linked in that comment is added to the try_vcs_checkout script, and there are two additional changes needed:

  1. Set fetch-depth: 0 in actions/checkout steps for dependencies so that the fell git history is checked out (only needed for dependencies, not for checking out its own code since that is already on the proper branch).

  2. Ensure that git 2.18+ is installed on the system before the actions/checkout steps are run. On 18.04, the standard version of git is 2.17, so we use the git-core ppa to install a newer version (currently 2.29). In anticipation of 20.04, which has git 2.25, I've moved the setup-ros step to the beginning, so that it alone can be used to install git when we switch to 20.04, and the ppa step can be removed.

This implements some behavior from our Jenkins CI that
attemps to checkout a branch of the same name in all
dependency packages. This requires setting `fetch-depth: 0`
in the actions/checkout steps and installing git 2.18+
before those checkout steps. For 18.04, the git-core ppa
is used; this will not be needed on 20.04.
Copy link
Collaborator

@agalbachicar agalbachicar left a comment

Choose a reason for hiding this comment

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

LGTM

@scpeters scpeters merged commit dabf1d2 into master Nov 24, 2020
@scpeters scpeters deleted the scpeters/shorten_maliput_test_utilities_target_name branch November 24, 2020 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants