From 4076a2bcdb467106187746ae1ac421b79cdaa0d9 Mon Sep 17 00:00:00 2001
From: Tyler Cook <10459406+cilki@users.noreply.github.com>
Date: Fri, 28 Feb 2025 20:07:50 -0600
Subject: [PATCH 1/3] Fix keyring update
---
action.yml | 4 ++--
entrypoint.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/action.yml b/action.yml
index a479ba6..7eb60eb 100644
--- a/action.yml
+++ b/action.yml
@@ -39,7 +39,7 @@ inputs:
description: 'Resolve dependencies using paru'
default: 'false'
required: false
- update_archlinux_keyring:
+ archlinux_keyring:
description: 'Update archlinux-keyring'
default: 'true'
required: false
@@ -56,4 +56,4 @@ runs:
- ${{ inputs.flags }}
- ${{ inputs.namcap }}
- ${{ inputs.aur }}
- - ${{ inputs.update_archlinux_keyring }}
+ - ${{ inputs.archlinux_keyring }}
diff --git a/entrypoint.sh b/entrypoint.sh
index 42cc504..1fa28c5 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,7 +16,7 @@ echo "::endgroup::"
# Update archlinux-keyring
if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
echo "::group::Updating archlinux-keyring"
- pacman -S archlinux-keyring
+ pacman -Syu archlinux-keyring
echo "::endgroup::"
fi
From cfcd11665c660d9f182218e98c1e4eb088f424d1 Mon Sep 17 00:00:00 2001
From: Tyler Cook <10459406+cilki@users.noreply.github.com>
Date: Fri, 28 Feb 2025 20:24:03 -0600
Subject: [PATCH 2/3] Run pacman as root
---
action.yml | 2 +-
entrypoint.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/action.yml b/action.yml
index 7eb60eb..c75a21f 100644
--- a/action.yml
+++ b/action.yml
@@ -46,7 +46,7 @@ inputs:
runs:
using: 'docker'
- image: 'docker://ghcr.io/heyhusen/archlinux-package-action:2'
+ image: Dockerfile
args:
- ${{ inputs.path }}
- ${{ inputs.pkgver }}
diff --git a/entrypoint.sh b/entrypoint.sh
index 1fa28c5..6bce09b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,7 +16,7 @@ echo "::endgroup::"
# Update archlinux-keyring
if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
echo "::group::Updating archlinux-keyring"
- pacman -Syu archlinux-keyring
+ sudo pacman -Syu archlinux-keyring
echo "::endgroup::"
fi
From a93ac07315e12e2d6a7d68d6453ce462926968f2 Mon Sep 17 00:00:00 2001
From: Tyler Cook <10459406+cilki@users.noreply.github.com>
Date: Fri, 28 Feb 2025 20:29:46 -0600
Subject: [PATCH 3/3] Pacman --noconfirm
---
entrypoint.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/entrypoint.sh b/entrypoint.sh
index 6bce09b..b0808c0 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -16,7 +16,7 @@ echo "::endgroup::"
# Update archlinux-keyring
if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
echo "::group::Updating archlinux-keyring"
- sudo pacman -Syu archlinux-keyring
+ sudo pacman -Syu --noconfirm archlinux-keyring
echo "::endgroup::"
fi