Merge pull request #21 from filips123/support-adding-assets

Add support for adding assets to AUR repository

Author: KSXGitHub

README.md

@@ -12,6 +12,11 @@ GitHub Actions to publish AUR package.
 
 **Required** Path to PKGBUILD file. This file is often generated by prior steps.
 
+### `assets`
+
+**Optional** Newline-separated glob patterns for additional files to be added to the AUR repository.
+Glob patterns will be expanded by bash when copying the files to the repository.
+
 ### `commit_username`
 
 **Required** The username to use when creating the new commit.

action.yml

@@ -11,6 +11,10 @@ inputs:
   pkgbuild:
     description: 'Path to PKGBUILD file'
     required: true
+  assets:
+    description: 'Newline-separated glob patterns for additional files to be added to the AUR repository'
+    required: false
+    default: ''
   commit_username:
     description: 'The username to use when creating the new commit'
     required: true

build.sh

@@ -4,6 +4,8 @@
 set -o errexit -o pipefail -o nounset
 
 pkgname=$INPUT_PKGNAME
+pkgbuild=$INPUT_PKGBUILD
+assets=$INPUT_ASSETS
 commit_username=$INPUT_COMMIT_USERNAME
 commit_email=$INPUT_COMMIT_EMAIL
 ssh_private_key=$INPUT_SSH_PRIVATE_KEY
@@ -22,12 +24,16 @@ assert_non_empty() {
 }
 
 assert_non_empty inputs.pkgname "$pkgname"
+assert_non_empty inputs.pkgbuild "$pkgbuild"
 assert_non_empty inputs.commit_username "$commit_username"
 assert_non_empty inputs.commit_email "$commit_email"
 assert_non_empty inputs.ssh_private_key "$ssh_private_key"
 
 export HOME=/home/builder
 
+# Ignore "." and ".." to prevent errors when glob pattern for assets matches hidden files
+GLOBIGNORE=".:.."
+
 echo '::group::Adding aur.archlinux.org to known hosts'
 ssh-keyscan -v -t "$ssh_keyscan_types" aur.archlinux.org >>~/.ssh/known_hosts
 echo '::endgroup::'
@@ -42,7 +48,7 @@ echo '::group::Checksums of SSH keys'
 sha512sum ~/.ssh/aur ~/.ssh/aur.pub
 echo '::endgroup::'
 
-echo '::group::Configuring git'
+echo '::group::Configuring Git'
 git config --global user.name "$commit_username"
 git config --global user.email "$commit_email"
 echo '::endgroup::'
@@ -51,20 +57,35 @@ echo '::group::Cloning AUR package into /tmp/local-repo'
 git clone -v "https://aur.archlinux.org/${pkgname}.git" /tmp/local-repo
 echo '::endgroup::'
 
-echo '::group::Generating PKGBUILD and .SRCINFO'
-cd /tmp/local-repo
-
-echo 'Copying PKGBUILD...'
-cp -v /PKGBUILD ./
-
-echo "Updating .SRCINFO"
-makepkg --printsrcinfo >.SRCINFO
+echo '::group::Copying files into /tmp/local-repo'
+{
+  echo "Copying $pkgbuild"
+  cp -r "$pkgbuild" /tmp/local-repo/
+}
+# shellcheck disable=SC2086
+# Ignore quote rule because we need to expand glob patterns to copy $assets
+{
+  echo "Copying " $assets
+  cp -rt /tmp/local-repo/ $assets
+}
+echo '::endgroup::'
 
+echo '::group::Generating .SRCINFO'
+cd /tmp/local-repo
+makepkg --printsrcinfo > .SRCINFO
 echo '::endgroup::'
 
-echo '::group::Publishing'
-git remote add aur "ssh://aur@aur.archlinux.org/${pkgname}.git"
-git add -fv PKGBUILD .SRCINFO
+echo '::group::Committing files to the repository'
+if [[ -z "$assets" ]]; then
+  # When $assets are not set, we can add just PKGBUILD and .SRCINFO
+  # This is to prevent unintended behaviour and maintain backwards compatibility
+  git add -fv PKGBUILD .SRCINFO
+else
+  # We cannot just re-use $assets because it contains absolute paths outside repository
+  # But we can just add all files in the repository which should also include all $assets
+  git add --all
+fi
+
 case "$allow_empty_commits" in
 true)
   git commit --allow-empty -m "$commit_message"
@@ -77,6 +98,10 @@ false)
   exit 2
   ;;
 esac
+echo '::endgroup::'
+
+echo '::group::Publishing the repository'
+git remote add aur "ssh://aur@aur.archlinux.org/${pkgname}.git"
 case "$force_push" in
 true)
   git push -v --force aur master

entrypoint.sh

@@ -2,23 +2,17 @@
 
 set -o errexit -o pipefail -o nounset
 
-pkgbuild=$INPUT_PKGBUILD
-
 echo '::group::Creating builder user'
 useradd --create-home --shell /bin/bash builder
 passwd --delete builder
 echo '::endgroup::'
 
-echo '::group::Initializing ssh directory'
+echo '::group::Initializing SSH directory'
 mkdir -pv /home/builder/.ssh
 touch /home/builder/.ssh/known_hosts
 cp -v /ssh_config /home/builder/.ssh/config
 chown -vR builder:builder /home/builder
 chmod -vR 600 /home/builder/.ssh/*
 echo '::endgroup::'
 
-echo '::group::Copying PKGBUILD'
-cp -r "$pkgbuild" /PKGBUILD
-echo '::endgroup::'
-
 exec runuser builder --command 'bash -l -c /build.sh'