Try to checkout matching gzdev branch for PR jobs #572
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
If GitHub branch contains `matching_branch/`, then try to checkout that branch from gzdev. Clone without --depth 1 to support this. Signed-off-by: Steve Peters <scpeters@openrobotics.org>
This was referenced Nov 24, 2021
j-rivero
requested changes
Nov 30, 2021
| RUN git clone https://github.com/ignition-tooling/gzdev -b ${GZDEV_BRANCH} ${GZDEV_DIR} | ||
| RUN bash -c "if [[ -n \"$GZDEV_TRY_BRANCH\" ]]; then git -C ${GZDEV_DIR} fetch origin \"$GZDEV_TRY_BRANCH\"; fi || true" | ||
| RUN bash -c "if [[ -n \"$GZDEV_TRY_BRANCH\" ]]; then git -C ${GZDEV_DIR} checkout \"$GZDEV_TRY_BRANCH\"; fi || true" | ||
| RUN git -C ${GZDEV_DIR} branch |
There was a problem hiding this comment.
What are we trying with running git branch here?
There was a problem hiding this comment.
this is just a debugging print statement
There was a problem hiding this comment.
oook!
Suggested change
| RUN git -C ${GZDEV_DIR} branch | |
| # print branch for information proposes | |
| RUN git -C ${GZDEV_DIR} branch |
| RUN git clone --depth 1 https://github.com/ignition-tooling/gzdev -b ${GZDEV_BRANCH} ${GZDEV_DIR} | ||
| RUN git clone https://github.com/ignition-tooling/gzdev -b ${GZDEV_BRANCH} ${GZDEV_DIR} | ||
| RUN bash -c "if [[ -n \"$GZDEV_TRY_BRANCH\" ]]; then git -C ${GZDEV_DIR} fetch origin \"$GZDEV_TRY_BRANCH\"; fi || true" | ||
| RUN bash -c "if [[ -n \"$GZDEV_TRY_BRANCH\" ]]; then git -C ${GZDEV_DIR} checkout \"$GZDEV_TRY_BRANCH\"; fi || true" |
There was a problem hiding this comment.
Could we merge this git command with the previous to save the duplication of the if?
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
j-rivero
approved these changes
Dec 1, 2021
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
| RUN if [ -n $GZDEV_TRY_BRANCH ]; then \ | ||
| git -C ${GZDEV_DIR} fetch origin $GZDEV_TRY_BRANCH || true; \ | ||
| git -C ${GZDEV_DIR} checkout $GZDEV_TRY_BRANCH || true; \ | ||
| fi || true" |
There was a problem hiding this comment.
The stray quote here was removed via direct push 99524e1
This was referenced Dec 3, 2021
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.
If a GitHub pull request branch contains
matching_branch/, then try to checkout that branch fromgzdev. To simplify checking out other branches, clone gzdev without--depth 1.Part of #564.
Testing: