Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for build-git-installers necessitated by changes in Git v2.48.0 #727

Merged
merged 3 commits into from
Feb 16, 2025
Merged

Fixes for build-git-installers necessitated by changes in Git v2.48.0 #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
627a6bf
fixup! release: create initial Windows installer build workflow
dscho Feb 13, 2025
842cfa4
fixup! release: build unsigned Ubuntu .deb package
dscho Feb 13, 2025
dc81d69
fixup! release: add Mac OSX installer build
dscho Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/macos-installer/Makefile
View file
Open in desktop
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
View file
Open in desktop
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
Loading