From 627a6bf2ddeffd91efbce55f53016bd3522af4a5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 13 Feb 2025 16:20:07 +0100 Subject: [PATCH 1/3] fixup! release: create initial Windows installer build workflow Probably in yet another patch to accommodate Meson (don't you love it now?) the spaces in the `GIT-VERSION-FILE` are now gone. Where before, its contents looked somewhat like this: GIT_VERSION = 2.48.1.vfs.0.0 they now look this this (note the removed spaces): GIT_VERSION=2.48.1.vfs.0.0 Well, so here is yet another other patch to accommodate Meson, so that we can finally get a pre-release of v2.48.1.vfs.0.0 out. Signed-off-by: Johannes Schindelin --- .github/workflows/build-git-installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index ae442d9e3d51cf..b4bf9b8d49833b 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -46,7 +46,7 @@ jobs: # Verify tag follows rules in GIT-VERSION-GEN (i.e., matches the specified "DEF_VER" in # GIT-VERSION-FILE) and matches tag determined from trigger make GIT-VERSION-FILE - test "${{ steps.tag.outputs.version }}" == "$(sed -n 's/^GIT_VERSION = //p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag does not match ${{ steps.tag.outputs.name }}" + test "${{ steps.tag.outputs.version }}" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}" # End check prerequisites for the workflow # Build Windows installers (x86_64 & aarch64; installer & portable) From 842cfa4aaaae057c3bf5931bc12c2a34448d17e1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 13 Feb 2025 16:34:12 +0100 Subject: [PATCH 2/3] fixup! release: build unsigned Ubuntu .deb package We need to require a newer Ubuntu version because Git fails to build with Ubuntu 16.04. This is needed because Ubuntu 16.04 apparently has a horribly outdated curl version and Git must at all cost drop support for it: 4c1b7e364e59 (Merge branch 'bc/drop-ancient-libcurl-and-perl', 2024-12-04). I just wish that at times pragmatism would beat ideology, but it's not to be had in this instance. Unfortunately, it requires a bit more than just changing the Ubuntu version, as the newer version would now ask interactively for the timezone while setting up the `tzdata` package. Signed-off-by: Johannes Schindelin --- .github/workflows/build-git-installers.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-git-installers.yml b/.github/workflows/build-git-installers.yml index b4bf9b8d49833b..94301be6ea3cd8 100644 --- a/.github/workflows/build-git-installers.yml +++ b/.github/workflows/build-git-installers.yml @@ -493,7 +493,7 @@ jobs: create-linux-unsigned-artifacts: runs-on: ubuntu-latest container: - image: ubuntu:16.04 # expanded security maintenance until 04/02/2026, according to https://endoflife.date/ubuntu + image: ubuntu:20.04 # security support until 04/02/2025, according to https://endoflife.date/ubuntu volumes: # override /__e/node20 because GitHub Actions uses a version that requires too-recent glibc, see "Install dependencies" below - /tmp:/__e/node20 @@ -502,6 +502,11 @@ jobs: - name: Install dependencies run: | set -ex + + # Prevent the dialog that asks interactively for the timezone + export DEBIAN_FRONTEND=noninteractive + export TZ=Etc/UTC + apt-get update -q apt-get install -y -q --no-install-recommends \ build-essential \ From dc81d69fbadaa229aa065d7cbdbb3aa1f9e19aa9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 13 Feb 2025 16:55:56 +0100 Subject: [PATCH 3/3] fixup! release: add Mac OSX installer build Sadly, since 904339edbd80 (Introduce support for the Meson build system, 2024-12-06) the `Documentation/asciidoc.conf` file that `contrib/subtree/` relies on is no longer present by default because it has to be generated now. This is yet another other, _other_ change required to accommodate Meson. Signed-off-by: Johannes Schindelin --- .github/macos-installer/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/macos-installer/Makefile b/.github/macos-installer/Makefile index 1a06f6200e62dc..6da1ec685d59ee 100644 --- a/.github/macos-installer/Makefile +++ b/.github/macos-installer/Makefile @@ -79,6 +79,7 @@ $(BUILD_DIR)/git-$(VERSION)/osx-installed-man: $(BUILD_DIR)/git-$(VERSION)/osx-i touch $@ $(BUILD_DIR)/git-$(VERSION)/osx-built-subtree: + $(SUBMAKE) -C $(BUILD_DIR)/git-$(VERSION)/Documentation asciidoc.conf cd $(BUILD_DIR)/git-$(VERSION)/contrib/subtree; $(SUBMAKE) XML_CATALOG_FILES="$(XML_CATALOG_FILES)" all git-subtree.1 touch $@