Merge tag 'v2.4.13' into debian

v2.4.13

1 files changed, 14 insertions, 32 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b6dc4e7..6f42ecd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,14 @@ jobs:
   test:
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.x']
+        python-version:
+          - '3.9'
+          - '3.10'
+          - '3.11'
+          - '3.12'
+          - '3.13'
+          - '3.14'
+          - '3.x'
     runs-on: ubuntu-latest
     name: 'Python ${{ matrix.python-version }}'
     steps:
@@ -33,9 +40,9 @@ jobs:
         with:
           python-version: '${{ matrix.python-version }}'
       - name: Run tests as root
-        run: sudo ./test/test.sh
+        run: sudo ./test/main.sh
       - name: Run tests
-        run: ./test/test.sh
+        run: ./test/main.sh
 
   aur:
     name: Publish to AUR
@@ -48,6 +55,9 @@ jobs:
       && !startsWith(github.ref, 'refs/tags/debian/')
     container:
       image: archlinux:base-devel
+      env:
+        SSH_KEY: |
+          ${{ secrets.SSH_KEY }}
     steps:
       # This step must be done before actions/checkout. From the latter's
       # output:
@@ -57,39 +67,11 @@ jobs:
       - name: Install dependencies
         run: |
           pacman -Syu --noconfirm git openssh
-
       - name: Checkout
         uses: actions/checkout@v7
         with:
           ref: aur
           token: '${{ secrets.GH_TOKEN }}'
-
-      # makepkg for no reason hard-forbids running as root. Kill me now.
-      - name: Add builder user
-        run: |
-          useradd -m -s /bin/bash builder
-          passwd -d builder
-          echo 'builder ALL=(ALL) ALL' >> /etc/sudoers
-          chown -R builder:builder -- "$GITHUB_WORKSPACE"
-
-      - name: Configure SSH
-        run: |
-          mkdir -p /home/builder/.ssh/
-          cat > /home/builder/.ssh/config <<'EOF'
-          StrictHostKeyChecking no
-          EOF
-          cat > /home/builder/.ssh/id_ed25519 <<'EOF'
-          ${{ secrets.SSH_KEY }}
-          EOF
-          chown -R builder:builder /home/builder/.ssh
-          chmod 0600 /home/builder/.ssh/id_ed25519
-
-      - name: Configure git
-        run: |
-          # See https://github.com/actions/checkout#push-a-commit-using-the-built-in-token
-          runuser -u builder -- git -C "$GITHUB_WORKSPACE" config user.name "github-actions[bot]"
-          runuser -u builder -- git -C "$GITHUB_WORKSPACE" config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
       - name: Run maintenance
         run: |
-          runuser -u builder -- make -C "$GITHUB_WORKSPACE" maintenance
+          make -C "$GITHUB_WORKSPACE" ci