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.

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

Conversation

dennisameling
Copy link

@dennisameling dennisameling commented May 15, 2024

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

Let's also enable arm64 support while we're at it.

Copy link
Member

@dscho dscho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

@dennisameling dennisameling force-pushed the remove-asciidoctor-workaround-arm64 branch from 9e448a9 to 15be0b3 Compare May 16, 2024 17:15
@dennisameling dennisameling changed the title mingw-w64-git: remove workaround for asciidoctor as it's no longer needed mingw-w64-git: switch to asciidoctor and enable arm64 for it May 16, 2024
@dennisameling dennisameling force-pushed the remove-asciidoctor-workaround-arm64 branch from 15be0b3 to 4beff6f Compare May 16, 2024 17:17
@dennisameling
Copy link
Author

dennisameling commented May 16, 2024

Ha, CI is failing with this error:

error: failed to commit transaction (conflicting files)
mingw-w64-x86_64-asciidoctor: /mingw64/bin/asciidoctor exists in filesystem
Errors occurred, no packages were upgraded.
==> ERROR: 'pacman' failed to install missing dependencies.
==> Missing dependencies:
  -> mingw-w64-x86_64-asciidoctor
==> ERROR: Could not resolve all dependencies.
Error: Process completed with exit code 8.

... which makes sense because the old asciidoctor-extensions also installed it like this in the filesystem. There's probably a way to address this efficiently. Any thoughts @dscho @rimrul?

@dscho
Copy link
Member

dscho commented May 16, 2024

There's probably a way to address this efficiently. Any thoughts @dscho @rimrul?

There' no PKGBUILD nor makepkg-mingw option I am aware of.

However, you could manually remove the offending package before invoking makepkg-mingw. Something along these lines:

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 <[email protected]>
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 <[email protected]>
@dscho dscho force-pushed the remove-asciidoctor-workaround-arm64 branch 2 times, most recently from 69ce79b to 6bd3d3b Compare June 12, 2024 16:11
…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 <[email protected]>
@dscho dscho force-pushed the remove-asciidoctor-workaround-arm64 branch from 6bd3d3b to 0546109 Compare June 12, 2024 16:23
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
@dscho dscho merged commit 907ead4 into main Jun 17, 2024
3 checks passed
@dscho dscho deleted the remove-asciidoctor-workaround-arm64 branch June 17, 2024 10:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants