From 904f4826c9fc01a8f048fe9300b75301d4e9c102 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 22 Sep 2026 07:55:31 +0200 Subject: [PATCH 1/3] fixup! azure-pipelines: add stub release pipeline for Azure It seems that the macOS job now times out because it has to rebuild Bottles for macOS/Intel that were previously pre-built. Let's extend the timeout so that the Pipeline no longer times out _after_ painfully building all dependencies (looking at you, `gettext`, which requires `cmake` to be built as well). Signed-off-by: Johannes Schindelin --- .azure-pipelines/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml index 83e159c0f7bcb4..aea81b11ed0a8c 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 }} From e0bd1e76930e4ac4bb827ec3d435ef66bd77e1a1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 22 Sep 2026 07:57:08 +0200 Subject: [PATCH 2/3] fixup! azure-pipelines: build, sign, notarize and stage the macOS installer When having to build dependencies, try to use the quicker parallel build. Signed-off-by: Johannes Schindelin --- .azure-pipelines/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml index aea81b11ed0a8c..a40f6c499e82bf 100644 --- a/.azure-pipelines/release.yml +++ b/.azure-pipelines/release.yml @@ -716,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: | From eb700bc716e77a1c578d3afe5202fd209f0e2bb2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 22 Sep 2026 07:57:53 +0200 Subject: [PATCH 3/3] azure-pipelines: temporarily pin an older gettext version Since we have to jump through hoops to build on macOS/Intel, still, some dependencies have to be rebuilt, which takes a painfully long time (the attempted Release runs for v2.55.0.vfs.0.9 required over 55 minutes _just_ in the step that installs the dependencies, causing the runs to time out). Let's try to remediate that _a little_ by avoiding to rebuild `gettext`. Signed-off-by: Johannes Schindelin --- .azure-pipelines/release.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/release.yml b/.azure-pipelines/release.yml index a40f6c499e82bf..a3eefe8a2183be 100644 --- a/.azure-pipelines/release.yml +++ b/.azure-pipelines/release.yml @@ -732,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