Fix bugs

.github/workflows/test.yml

@@ -2,27 +2,28 @@ name: Test build
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+      - uses: actions/checkout@master
 
-    - name: Build Package
-      uses: ./
-      with:
-        package_name: ciallo
-        gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-        gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Build Package
+        uses: ./
+        with:
+          package_name: ciallo
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          pkgs_directory: test
 
-    - name: Upload Package
-      uses: actions/upload-artifact@main
-      with:
-        name: ciallo-package
-        path: test/ciallo/*.pkg.tar.zst*
+      - name: Upload Package
+        uses: actions/upload-artifact@main
+        with:
+          name: ciallo-package
+          path: test/ciallo/*.pkg.tar.zst*

Dockerfile

@@ -2,5 +2,8 @@ FROM archlinux:base-devel
 
 RUN pacman -Syu --noconfirm
 RUN pacman -S git gnupg --noconfirm
+
 COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]

action.yml

@@ -9,10 +9,15 @@ inputs:
   gpg_passphrase:
     description: "GPG passphrase for building"
     required: true
+  pkgs_directory:
+    description: "Directory of package subdirectories"
+    required: false
+    default: "."
 runs:
   using: "docker"
   image: "Dockerfile"
   args:
     - ${{ inputs.package_name }}
     - ${{ inputs.gpg_private_key }}
     - ${{ inputs.gpg_passphrase }}
+    - ${{ inputs.pkgs_directory }}

entrypoint.sh

@@ -5,13 +5,10 @@ set -e
 pkgname=$1
 gpg_private_key=$2
 gpg_passphrase=$3
-
-# Create builder user
-useradd builder -m
-echo "builder ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+pkgdir=$4
 
 # Find the PKGBUILD directory
-pkgbuild_dir=$(readlink -f "$pkgname")
+pkgbuild_dir=$(readlink -f "$pkgdir/$pkgname")
 
 if [[ ! -d $pkgbuild_dir ]]; then
     echo "$pkgbuild_dir should be a directory."
@@ -23,20 +20,32 @@ if [[ ! -e $pkgbuild_dir/PKGBUILD ]]; then
     exit 1
 fi
 
-# Fix directory permissions
+# Create builder user
+useradd -m builder
+echo "builder ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
+mkdir -p /home/builder/.gnupg
+chown -R builder:builder /home/builder/.gnupg
+chmod 700 /home/builder/.gnupg
 chown -R builder:builder "$pkgbuild_dir"
-chown -R builder:builder /home/builder
 
 # Import GPG key
-echo "$gpg_private_key" | sudo -u builder gpg --import
-echo "$gpg_passphrase" | sudo -u builder gpg --batch --passphrase-fd 0 --pinentry-mode loopback -s /dev/null
+sudo -u builder bash <<EOF
+export HOME=/home/builder
+echo "$gpg_private_key" | gpg --batch --import
+gpg --list-secret-keys --keyid-format LONG
+EOF
 
 # Build package
-cd "$pkgbuild_dir"
 sudo -u builder bash <<EOF
-export GPG_TTY=\$(tty)
-echo "$gpg_passphrase" | gpg --batch --passphrase-fd 0 --pinentry-mode loopback -s /dev/null
-makepkg -srf --sign --noconfirm
+cd "$pkgbuild_dir"
+makepkg -srf --noconfirm
+EOF
+
+# Sign package
+sudo -E -u builder bash <<EOF
+export HOME=/home/builder
+cd "$pkgbuild_dir"
+echo "$gpg_passphrase" | gpg --pinentry-mode loopback --passphrase-fd 0 --detach-sign *.pkg.tar.zst
 EOF
 
 cd -