Skip to content

brew CI: check RTOOLS_BRANCH for ci_matching_branch #1509

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

Merged
scpeters merged 2 commits into from
Jun 21, 2026
Merged

brew CI: check RTOOLS_BRANCH for ci_matching_branch #1509

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68941fd
brew CI: check RTOOLS_BRANCH for ci_matching_branch
scpeters Jun 6, 2026
abe4672
Merge branch 'master' into ci_matching_branch/brew_rtools_ci_matching…
j-rivero Jun 18, 2026
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
17 changes: 14 additions & 3 deletions jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,24 @@ brew tap osrf/simulation
brew trust osrf/simulation
echo '# END SECTION'

# check if github pull request source branch starts with ci_matching_branch/
if [[ -n "${ghprbSourceBranch}" ]] && \
python3 ${SCRIPT_DIR}/tools/detect_ci_matching_branch.py "${ghprbSourceBranch}"
then
echo "# BEGIN SECTION: trying to checkout branch ${ghprbSourceBranch} from osrf/simulation"
export CI_MATCHING_BRANCH=${ghprbSourceBranch}
# otherwise check if release-tools branch starts with ci_matching_branch/
elif [[ -n "${RTOOLS_BRANCH}" ]] && \
python3 ${SCRIPT_DIR}/tools/detect_ci_matching_branch.py "${RTOOLS_BRANCH}"
then
export CI_MATCHING_BRANCH=${RTOOLS_BRANCH}
fi

if [[ -n "${CI_MATCHING_BRANCH}" ]]
then
echo "# BEGIN SECTION: trying to checkout branch ${CI_MATCHING_BRANCH} from osrf/simulation"
pushd $(brew --repo osrf/simulation)
git fetch origin ${ghprbSourceBranch} || true
git checkout ${ghprbSourceBranch} || true
git fetch origin ${CI_MATCHING_BRANCH} || true
git checkout ${CI_MATCHING_BRANCH} || true
popd
echo '# END SECTION'
fi
Expand Down
Loading