From c3e3ab0325c9567f093be64244661afc2397e1bb Mon Sep 17 00:00:00 2001
From: kamack38 <64226248+kamack38@users.noreply.github.com>
Date: Wed, 27 Apr 2022 14:06:06 +0200
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20Add=20option=20to=20reso?=
=?UTF-8?q?lve=20deps=20using=20paru=20(from=20AUR)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 4 ++++
action.yml | 5 +++++
entrypoint.sh | 10 +++++++++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index e83c16e..6a18baa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,10 @@ RUN useradd -m builder && \
WORKDIR /home/builder
USER builder
+# Install paru
+RUN git clone https://aur.archlinux.org/paru-bin.git
+RUN cd paru-bin && makepkg -si --noconfirm
+
# Copy files
COPY LICENSE README.md /
COPY entrypoint.sh /entrypoint.sh
diff --git a/action.yml b/action.yml
index 780df7e..a0a033d 100644
--- a/action.yml
+++ b/action.yml
@@ -35,6 +35,10 @@ inputs:
description: 'Validate package with namcap'
default: 'true'
required: false
+ aur:
+ description: 'Resolve dependencies using AUR'
+ default: 'false'
+ required: false
runs:
using: 'docker'
@@ -47,3 +51,4 @@ runs:
- ${{ inputs.srcinfo }}
- ${{ inputs.flags }}
- ${{ inputs.namcap }}
+ - ${{ inputs.aur }}
diff --git a/entrypoint.sh b/entrypoint.sh
index 0cc1502..160582d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -40,7 +40,7 @@ fi
# Generate .SRCINFO
if [[ $INPUT_SRCINFO == true ]]; then
echo "::group::Generating new .SRCINFO based on PKGBUILD"
- makepkg --printsrcinfo > .SRCINFO
+ makepkg --printsrcinfo >.SRCINFO
git diff .SRCINFO
echo "::endgroup::"
fi
@@ -52,6 +52,14 @@ if [[ $INPUT_NAMCAP == true ]]; then
echo "::endgroup::"
fi
+# Install depends using paru from aur
+if [[ -n $INPUT_AUR ]]; then
+ echo "::group::Installing depends using paru"
+ source PKGBUILD
+ paru -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
+ echo "::endgroup::"
+fi
+
# Run makepkg
if [[ -n $INPUT_FLAGS ]]; then
echo "::group::Running makepkg with flags"