diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml index 83e159c0f7bcb4..a3eefe8a2183be 100644 --- a/.azure-pipelines/release.yml +++ b/.azure-pipelines/release.yml @@ -674,6 +674,7 @@ extends: - ${{ each dim in parameters.macos_matrix }}: - job: ${{ dim.id }} displayName: ${{ dim.jobName }} + timeoutInMinutes: 360 pool: name: ${{ dim.pool }} image: ${{ dim.image }} @@ -715,6 +716,8 @@ extends: sudo mdutil -i off / || true - task: Bash@3 displayName: 'Install build dependencies' + env: + HOMEBREW_MAKE_JOBS: '8' inputs: targetType: inline script: | @@ -729,7 +732,18 @@ extends: rev=7a133dcc74051ee4efc79467ed215dfedf45aea2 arch -x86_64 /bin/bash -c \ "$(curl -fsSL "$url/$rev/install.sh")" - arch -x86_64 /usr/local/bin/brew install gettext + # Pin a formula with an Intel macOS bottle. + x86_brew () { + arch -x86_64 /usr/local/bin/brew "$@" + } + x86_brew tap-new --no-git microsoft/git-ci + tap="$(x86_brew --repository microsoft/git-ci)" + url=https://raw.githubusercontent.com + url=$url/Homebrew/homebrew-core + rev=87b79807b37427774de3b55f9d89eb9f6286f1fa + curl -fsSL "$url/$rev/Formula/g/gettext.rb" \ + -o "$tap/Formula/gettext.rb" + x86_brew install --force-bottle microsoft/git-ci/gettext # Ensure native Homebrew (arm64) is up-to-date beforehand. HOMEBREW_NO_AUTO_UPDATE='' brew update