Skip to content

Commit

Permalink
Fixes for build-git-installers necessitated by changes in Git v2.48…
Browse files Browse the repository at this point in the history
….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.
  • Loading branch information
dscho authored Feb 16, 2025
2 parents bda3f91 + dc81d69 commit 69c0749
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/macos-installer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/build-git-installers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 69c0749

Please sign in to comment.