mingw-w64-git: switch to asciidoctor and enable arm64 for it#119
Merged
Conversation
9e448a9 to
15be0b3
Compare
15be0b3 to
4beff6f
Compare
Author
|
Ha, CI is failing with this error: ... which makes sense because the old |
Member
There' no However, you could manually remove the offending package before invoking test mingw-w64-git != '${{ matrix.directory }}' ||
test ! -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* ||
pacman -R --noconfirm mingw-w64-$MSYSTEM_CARCH-asciidoctor-extensions |
While enabling clangarm64 support on GfW's `mingw-w64-asciidoctor-extensions` package, we realized that the extensions are likely not needed anymore, because the Git project added its own `Documentation/asciidoctor-extensions.rb` back in 2017. Let's switch to the MSYS2-maintaned `mingw-w64-asciidoctor` instead, so we don't have to maintain our own package anymore. Ref: #118 Ref: git/git@55d2d81 Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Ruby support was added to clangarm64 in November 2023, so we can now enable asciidoctor on ARM64 as well. Ref: msys2#19179 Ref: #118 Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
69ce79b to
6bd3d3b
Compare
…tor` We want to switch from using `asciidoctor-extensions` to using regular `asciidoctor` instead (the custom macros are no longer needed). To that end, we want to install `mingw-w64-asciidoctor`, but that would fail due to a conflict with the `mingw-w64-asciidoctor-extensions` package: error: failed to commit transaction (conflicting files) mingw-w64-x86_64-asciidoctor: /mingw64/bin/asciidoctor exists in filesystem Let's work around that by explicitly removing the latter package as needed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
6bd3d3b to
0546109
Compare
dscho
added a commit
to dscho/build-extra
that referenced
this pull request
Jun 12, 2024
This patch is a companion of git-for-windows/MINGW-packages#119: Git for Windows will use regular `asciidoctor`, not the AsciiDoctor extensions. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git-sdk-64
that referenced
this pull request
Jun 12, 2024
In git-for-windows/MINGW-packages#119, Git for Windows switched away from the custom-built Asciidoctor extensions, now instead using the regular Asciidoctor. This patch is a companion of that PR to ensure that Git for Windows' SDK is aligned with that change. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git-sdk-64
that referenced
this pull request
Jun 12, 2024
In git-for-windows/MINGW-packages#119, Git for Windows switched away from the custom-built Asciidoctor extensions, now instead using the regular Asciidoctor. This patch is a companion of that PR to ensure that Git for Windows' SDK is aligned with that change. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git-sdk-64
that referenced
this pull request
Jun 12, 2024
In git-for-windows/MINGW-packages#119, Git for Windows switched away from the custom-built Asciidoctor extensions, now instead using the regular Asciidoctor. This patch is a companion of that PR to ensure that Git for Windows' SDK is aligned with that change. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to dscho/git-sdk-32
that referenced
this pull request
Jun 12, 2024
In git-for-windows/MINGW-packages#119, Git for Windows switched away from the custom-built Asciidoctor extensions, now instead using the regular Asciidoctor. This patch is a companion of that PR to ensure that Git for Windows' SDK is aligned with that change. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
added a commit
to git-for-windows/git-sdk-arm64
that referenced
this pull request
Jun 12, 2024
In git-for-windows/MINGW-packages#119, Git for Windows switched away from the custom-built Asciidoctor extensions, now instead using the regular Asciidoctor. This patch is a companion of that PR to ensure that Git for Windows' SDK is aligned with that change. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While enabling clangarm64 support on GfW's
mingw-w64-asciidoctor-extensionspackage, we realized that theextensions are likely not needed anymore, because the Git project
added its own
Documentation/asciidoctor-extensions.rbback in 2017.Let's switch to the MSYS2-maintaned
mingw-w64-asciidoctorinstead,so we don't have to maintain our own package anymore.
Ref: #118
Ref: git/git@55d2d81
Let's also enable arm64 support while we're at it.