diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index b2daaf437..661afcd8c 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -67,9 +67,17 @@ then echo '# END SECTION' fi +echo "# BEGIN SECTION: check if ${PROJECT_FORMULA} is HEAD formula" +# Install with --HEAD if formula lacks a stable URL +HEAD_FLAG="" +if brew ruby -e "exit '${PROJECT_FORMULA}'.f.stable.nil?"; then + HEAD_FLAG="--HEAD" +fi +echo '# END SECTION' + echo "# BEGIN SECTION: install ${PROJECT_FORMULA} dependencies" # Process the package dependencies -brew install ${PROJECT_FORMULA} ${PROJECT_ARGS} --only-dependencies +brew install ${PROJECT_FORMULA} ${PROJECT_ARGS} --only-dependencies ${HEAD_FLAG} # the following is needed to install :build dependencies of a formula brew install $(brew deps --1 --include-build ${PROJECT_FORMULA}) diff --git a/jenkins-scripts/lib/project-install-homebrew.bash b/jenkins-scripts/lib/project-install-homebrew.bash index f28626e80..a17976583 100644 --- a/jenkins-scripts/lib/project-install-homebrew.bash +++ b/jenkins-scripts/lib/project-install-homebrew.bash @@ -54,8 +54,16 @@ then echo '# END SECTION' fi +echo "# BEGIN SECTION: check if ${BOTTLE_NAME} is HEAD formula" +# Install with --HEAD if formula lacks a stable URL +HEAD_FLAG="" +if brew ruby -e "exit '${BOTTLE_NAME}'.f.stable.nil?"; then + HEAD_FLAG="--HEAD" +fi +echo '# END SECTION' + echo "# BEGIN SECTION: install ${BOTTLE_NAME}" -brew install --include-test ${BOTTLE_NAME} +brew install --include-test ${BOTTLE_NAME} ${HEAD_FLAG} # add X11 path so glxinfo can be found export PATH="${PATH}:/opt/X11/bin"