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

mingw-w64-git: switch to asciidoctor and enable arm64 for it #119

Merged
merged 3 commits into from
Jun 17, 2024
+20 −10
Merged

mingw-w64-git: switch to asciidoctor and enable arm64 for it #119

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
a10ddf8
git: switch from GfW's asciidoctor-extensions to MSYS2's asciidoctor
dennisameling May 16, 2024
e51348a
mingw-w64-git: enable asciidoctor on arm64
dennisameling May 16, 2024
0546109
ci: implement a (temporary) workaround to help switching to `asciidoc…
dscho Jun 12, 2024
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
18 changes: 18 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ jobs:
# reduce time required to install packages by disabling pacman's disk space checking
sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&

# help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
if test mingw-w64-git = '${{ matrix.directory }}'
then
packages=$(ls -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* 2>/dev/null |
sed -e 's|-[0-9].*||' -e 's|.*/||')
if test -n "$packages"
then
pacman -R --noconfirm $packages
fi &&
for prefix in /mingw32 /mingw64 /clangarm64
do
if test -x $prefix/bin/gem
then
PATH=$prefix/bin:$PATH gem uninstall asciidoctor
fi
done
fi &&

top_dir=$PWD &&
cd "${{ matrix.directory }}" &&
MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&
Expand Down
12 changes: 2 additions & 10 deletions mingw-w64-git/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ license=('GPL2')

options=()
makedepends=('python' 'less' 'openssh' 'patch' 'make' 'tar' 'diffutils'
'ca-certificates' 'xmlto' "${MINGW_PACKAGE_PREFIX}-asciidoctor-extensions")
'ca-certificates' 'xmlto' "${MINGW_PACKAGE_PREFIX}-asciidoctor")
install=git.install

case "$(printf "%s\n%s\n" "$pkgver" "2.18.0" | sort -V)" in
Expand Down Expand Up @@ -74,7 +74,6 @@ sha256sums=('SKIP'
'7413506c59d25621e475aa45447993748332c72cfbb4cf94cce6bee6f1218a09'
'6d83e1cb1acdb6eb1f2d5cb9299298e57680f5ca43d43c3e67c9da17f21b9b01')

USE_ASCIIDOCTOR="YesPlease"
COMPAT_CFLAGS=
STRIP=
STRIP_OPTS=
Expand All @@ -98,13 +97,6 @@ else
options+=('strip')
fi

if test CLANGARM64 = "$MSYSTEM"
then
# Asciidoctor depends on Ruby which is not available for CLANGARM64 yet
makedepends=("${makedepends[@]/${MINGW_PACKAGE_PREFIX}-asciidoctor-extensions}")
USE_ASCIIDOCTOR=
fi

pkgver() {
cd "$srcdir/git"
basever=${tag%.windows.*}
Expand All @@ -130,7 +122,7 @@ prepare () {
cd "$srcdir/git" &&

cat >config.mak <<-EOF
USE_ASCIIDOCTOR = $USE_ASCIIDOCTOR
USE_ASCIIDOCTOR = YesPlease
COMPAT_CFLAGS += $COMPAT_CFLAGS
LDFLAGS = $LDFLAGS
EOF
Expand Down