Clean up gzdev calls and use docker cache via ADD for gzdev changes #1200
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
j-rivero
commented
Nov 6, 2024
| cat >> Dockerfile << DELIM_OSRF_REPO_GIT | ||
| RUN rm -fr ${GZDEV_DIR} | ||
| RUN git clone https://github.com/gazebo-tooling/gzdev -b ${GZDEV_BRANCH} ${GZDEV_DIR} | ||
| RUN if [ -n $GZDEV_TRY_BRANCH ]; then \ |
There was a problem hiding this comment.
To support also docker caching the GZDEV_TRY_BRANCH this check has been taken out of the Dockerfile and a new ADD to check the GZDEV_TRY_BRANCH was added in adding to the two git commands.
|
I've been executing it several times in https://build.osrfoundation.org/job/_test_gz_math-ci-gz-math7-noble-amd64/ playing with changes in gzdev and try branch. Seemed to me to work as expected. |
|
Going to merge this one before it stays for too long out of my radar. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR clean up most of the gzdev code that deal with possible changes in gzdev configuraton in different parts of the Dockerfile: The mechanism used is to leverage the caching actions to the Docker layer caching using the
ADD https://api.github.com/repos/gazebo-tooling/gzdev/git/refs/heads/$branch version.jsonthat should invalidate the cache on changes done to the branch inside gzdev (affecting code or configurations). The current implementation will invalidate all the cache on any change to the gzdev branch.The PR also changes the installation of gzdev to be under the /root directory.