Skip to content

Commit

Permalink
ci: implement a (temporary) workaround to help switching to `asciidoc…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
dscho committed Jun 12, 2024
1 parent 4beff6f commit 4558d59
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ 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`
{
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
} &&
top_dir=$PWD &&
cd "${{ matrix.directory }}" &&
MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&
Expand Down

0 comments on commit 4558d59

Please sign in to comment.