Skip to content

Commit 69c0749

Browse files
authored
Fixes for build-git-installers necessitated by changes in Git v2.48.0 (#727)
The refactorings will continue until morale improves. These refactorings required a couple of changes to get the release workflow to work again, otherwise there wouldn't have been any v2.48.1.vfs.0.0. Took me only 7 attempts and several choice words to those who require deployment workflows to be defined within the Git-tracked source code that is to be deployed.
2 parents bda3f91 + dc81d69 commit 69c0749

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/macos-installer/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ $(BUILD_DIR)/git-$(VERSION)/osx-installed-man: $(BUILD_DIR)/git-$(VERSION)/osx-i
7979
touch $@
8080

8181
$(BUILD_DIR)/git-$(VERSION)/osx-built-subtree:
82+
$(SUBMAKE) -C $(BUILD_DIR)/git-$(VERSION)/Documentation asciidoc.conf
8283
cd $(BUILD_DIR)/git-$(VERSION)/contrib/subtree; $(SUBMAKE) XML_CATALOG_FILES="$(XML_CATALOG_FILES)" all git-subtree.1
8384
touch $@
8485

.github/workflows/build-git-installers.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
# Verify tag follows rules in GIT-VERSION-GEN (i.e., matches the specified "DEF_VER" in
4747
# GIT-VERSION-FILE) and matches tag determined from trigger
4848
make GIT-VERSION-FILE
49-
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 }}"
49+
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 }}"
5050
# End check prerequisites for the workflow
5151

5252
# Build Windows installers (x86_64 & aarch64; installer & portable)
@@ -493,7 +493,7 @@ jobs:
493493
create-linux-unsigned-artifacts:
494494
runs-on: ubuntu-latest
495495
container:
496-
image: ubuntu:16.04 # expanded security maintenance until 04/02/2026, according to https://endoflife.date/ubuntu
496+
image: ubuntu:20.04 # security support until 04/02/2025, according to https://endoflife.date/ubuntu
497497
volumes:
498498
# override /__e/node20 because GitHub Actions uses a version that requires too-recent glibc, see "Install dependencies" below
499499
- /tmp:/__e/node20
@@ -502,6 +502,11 @@ jobs:
502502
- name: Install dependencies
503503
run: |
504504
set -ex
505+
506+
# Prevent the dialog that asks interactively for the timezone
507+
export DEBIAN_FRONTEND=noninteractive
508+
export TZ=Etc/UTC
509+
505510
apt-get update -q
506511
apt-get install -y -q --no-install-recommends \
507512
build-essential \

0 commit comments

Comments
 (0)