fix: add arch tests too

Author: jpulec

.github/workflows/test.yml

@@ -7,16 +7,19 @@ on:
     branches: [main, master]
 
 jobs:
-  test-ubuntu:
+  test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distro: [ubuntu, arch]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Build and test on Ubuntu 24.04
+      - name: Build and test on ${{ matrix.distro }}
         run: |
           docker build \
-            --file test/Dockerfile.ubuntu \
-            --tag dotfiles-test:ubuntu \
+            --file test/Dockerfile.${{ matrix.distro }} \
+            --tag dotfiles-test:${{ matrix.distro }} \
             .
-          docker run --rm dotfiles-test:ubuntu
+          docker run --rm dotfiles-test:${{ matrix.distro }}

run_once_install-packages.sh.tmpl

@@ -50,11 +50,11 @@ if command -v batcat >/dev/null 2>&1 && ! command -v bat >/dev/null 2>&1; then
     sudo ln -sf "$(command -v batcat)" /usr/local/bin/bat
 fi
 
-# Set fish as default shell
+{{ end -}}
+# Set fish as default shell (applies to all distros)
 if [ "$(getent passwd "$(whoami)" | cut -d: -f7)" != "$(which fish)" ]; then
     sudo chsh -s "$(which fish)" "$(whoami)"
 fi
 
-{{ end -}}
 echo "Portable CLI tools installed"
 {{ end -}}

test/Dockerfile.arch

@@ -0,0 +1,27 @@
+FROM archlinux:latest
+
+# Update system and install base dependencies
+RUN pacman -Syu --noconfirm && \
+    pacman -S --noconfirm --needed \
+      base-devel \
+      curl \
+      git \
+      sudo \
+    && pacman -Scc --noconfirm
+
+# Create test user with sudo access
+RUN useradd -m -s /bin/bash testuser && \
+    echo "testuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/testuser
+
+# Switch to test user
+USER testuser
+WORKDIR /home/testuser
+
+# Copy dotfiles into container
+COPY --chown=testuser:testuser . /home/testuser/.local/share/chezmoi
+
+# Run install script
+RUN cd /home/testuser/.local/share/chezmoi && ./install.sh
+
+# Default command runs the test script
+CMD ["/home/testuser/.local/share/chezmoi/test/verify.sh"]

test/run.sh

@@ -7,15 +7,42 @@ REPO_DIR="$(dirname "$SCRIPT_DIR")"
 
 cd "$REPO_DIR"
 
-echo "=== Building Ubuntu test image ==="
-docker build \
-    --file test/Dockerfile.ubuntu \
-    --tag dotfiles-test:ubuntu \
-    .
+# Parse arguments
+DISTROS="${1:-all}"
 
-echo ""
-echo "=== Running tests ==="
-docker run --rm dotfiles-test:ubuntu
+run_test() {
+    local distro="$1"
+    echo ""
+    echo "========================================"
+    echo "  Testing on: $distro"
+    echo "========================================"
+    echo ""
+    
+    echo "==> Building $distro test image..."
+    docker build \
+        --file "test/Dockerfile.$distro" \
+        --tag "dotfiles-test:$distro" \
+        .
+    
+    echo ""
+    echo "==> Running tests on $distro..."
+    docker run --rm "dotfiles-test:$distro"
+}
+
+if [ "$DISTROS" = "all" ]; then
+    run_test "ubuntu"
+    run_test "arch"
+elif [ "$DISTROS" = "ubuntu" ] || [ "$DISTROS" = "arch" ]; then
+    run_test "$DISTROS"
+else
+    echo "Usage: $0 [all|ubuntu|arch]"
+    echo "  all    - Test on both Ubuntu and Arch (default)"
+    echo "  ubuntu - Test on Ubuntu only"
+    echo "  arch   - Test on Arch only"
+    exit 1
+fi
 
 echo ""
-echo "=== Tests completed ==="
+echo "========================================"
+echo "  All tests completed successfully!"
+echo "========================================"