Skip to content

Commit

Permalink
Add ci_matching_branch/ for bottle install jobs (#1005)
Browse files Browse the repository at this point in the history
If the release-tools branch (RTOOLS_BRANCH) starts with
ci_matching_branch/ then try to check out a matching
branch from the osrf/homebrew-simulation tap for
bottle install jobs.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
  • Loading branch information
scpeters and j-rivero committed Nov 2, 2023
1 parent 82ce89e commit 3f3e34d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions jenkins-scripts/lib/project-install-homebrew.bash
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ echo '# BEGIN SECTION: setup the osrf/simulation tap'
brew tap osrf/simulation
echo '# END SECTION'

if python3 "${SCRIPT_DIR}/tools/detect_ci_matching_branch.py" "${RTOOLS_BRANCH}"
then
echo "# BEGIN SECTION: trying to checkout branch ${RTOOLS_BRANCH} from osrf/simulation"
pushd "$(brew --repo osrf/simulation)"
git fetch origin "${RTOOLS_BRANCH}" || true
git checkout "${RTOOLS_BRANCH}" || true
popd
echo '# END SECTION'
fi

echo "# BEGIN SECTION: install ${BOTTLE_NAME}"
brew install --include-test ${BOTTLE_NAME}

Expand Down

0 comments on commit 3f3e34d

Please sign in to comment.