Skip to content

Commit 4558d59

Browse files
committed
ci: implement a (temporary) workaround to help switching to asciidoctor
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]>
1 parent 4beff6f commit 4558d59

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ jobs:
5959
# reduce time required to install packages by disabling pacman's disk space checking
6060
sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&
6161
62+
# help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
63+
{
64+
test mingw-w64-git != '${{ matrix.directory }}' ||
65+
test ! -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* ||
66+
pacman -R --noconfirm mingw-w64-$MSYSTEM_CARCH-asciidoctor-extensions
67+
} &&
68+
6269
top_dir=$PWD &&
6370
cd "${{ matrix.directory }}" &&
6471
MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&

0 commit comments

Comments
 (0)