From 3b434a5122035be79e7edda54448ec8e9f29ed8f Mon Sep 17 00:00:00 2001
From: "Yury V. Zaytsev" <yury@shurup.com>
Date: Sat, 19 Oct 2024 13:47:44 +0200
Subject: [PATCH] fixup! (canonicalize_pathname_custom): fix
 `--disable-charset` build broken in 8f723b8

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
---
 .github/workflows/ci-alpine.yml |  6 +++---
 .github/workflows/ci-fedora.yml | 16 ++++++++--------
 .github/workflows/ci.yml        | 12 ++++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci-alpine.yml b/.github/workflows/ci-alpine.yml
index 810638d21a..d381aaefb5 100644
--- a/.github/workflows/ci-alpine.yml
+++ b/.github/workflows/ci-alpine.yml
@@ -23,15 +23,15 @@ jobs:
 
       - name: Build default configuration
         run: |
+          mkdir build-default
+
           # Tests must be run as a non-root user
           adduser --home "$(pwd)/build-default" --no-create-home --disabled-password test users
           chown test:users -R $(pwd)
 
-          sudo -u test -i mkdir build-default && cd $_
-
           sudo -u test -i \
             ../configure \
-              --prefix="$(pwd)/install" \
+              --prefix="$(pwd)/build-default/install" \
               --enable-mclib \
               --enable-aspell
 
diff --git a/.github/workflows/ci-fedora.yml b/.github/workflows/ci-fedora.yml
index c69af01ad5..35f197cdea 100644
--- a/.github/workflows/ci-fedora.yml
+++ b/.github/workflows/ci-fedora.yml
@@ -26,21 +26,21 @@ jobs:
 
       - name: Build default configuration
         run: |
+          mkdir build-default
+
           # Tests must be run as a non-root user
-          useradd -ms /bin/bash test
+          useradd --home "$(pwd)/build-default" test
           chown test:test -R $(pwd)
 
-          sudo -u test mkdir build-default && cd $_
-
-          sudo -u test \
+          sudo -u test -i \
             ../configure \
-              --prefix="$(pwd)/install" \
+              --prefix="$(pwd)/build-default/install" \
               --enable-mclib \
               --enable-aspell
 
-          sudo -u test make -j$(nproc)
-          sudo -u test make check
-          sudo -u test make install
+          sudo -u test -i make -j$(nproc)
+          sudo -u test -i make check
+          sudo -u test -i make install
 
       - uses: actions/upload-artifact@v4
         if: failure()
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8703db4708..94e3157369 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: CI
 on: [ push, pull_request ]
 
 jobs:
-  call-build-ubuntu:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    uses: ./.github/workflows/ci-ubuntu.yml
+#  call-build-ubuntu:
+#    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+#    uses: ./.github/workflows/ci-ubuntu.yml
 
   call-build-fedora:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
@@ -14,6 +14,6 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     uses: ./.github/workflows/ci-alpine.yml
 
-  call-build-macos:
-    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
-    uses: ./.github/workflows/ci-macos.yml
+#  call-build-macos:
+#    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
+#    uses: ./.github/workflows/ci-macos.yml