chore: release v3.0.0

Signed-off-by: Husen <hi@husen.id>

.github/dependabot.yml

@@ -4,4 +4,4 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"

.github/workflows/main.yml

@@ -17,39 +17,49 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Update action.yml to build locally
         run: |
           sed -i 's/.*image\:.*/  image\: \"Dockerfile\"/' action.yml
           cat action.yml
 
-      - name: Get sample PKGBUILD
+      - name: Get sample package
-        run: wget https://github.com/hapakaien/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
+        run: |
-
+          # Spotify 1:1.2.79.427-1
+          mkdir spotify
+          pushd spotify
+          wget https://github.com/christian-heusel/aur/raw/f12a03c830a3d4a5c16de561bf411eec55d0798c/spotify/PKGBUILD
+          wget https://github.com/christian-heusel/aur/raw/f12a03c830a3d4a5c16de561bf411eec55d0798c/spotify/.SRCINFO
+          wget https://github.com/christian-heusel/aur/raw/f12a03c830a3d4a5c16de561bf411eec55d0798c/spotify/LICENSE
+          wget https://github.com/christian-heusel/aur/raw/f12a03c830a3d4a5c16de561bf411eec55d0798c/spotify/spotify.protocol
+          wget https://github.com/christian-heusel/aur/raw/f12a03c830a3d4a5c16de561bf411eec55d0798c/spotify/spotify.sh
+          popd
       - name: Running test
         uses: ./
         with:
-          pkgver: '0.4.26'
           pkgrel: 2
           updpkgsums: true
           srcinfo: true
+          path: 'spotify'
+          pgpkeys: '5384CE82BA52C83A'
 
       - name: Show diff
         run: |
           ls -la
-          git diff PKGBUILD
+          git diff
-          git diff .SRCINFO
 
   publish:
     name: Publish OCI image
     needs: pretest
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
@@ -60,7 +70,7 @@ jobs:
 
       - name: OCI metadata
         id: metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
@@ -98,10 +108,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Get sample PKGBUILD
-        run: wget https://github.com/hapakaien/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
+        run: wget https://github.com/${{ github.repository_owner }}/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
 
       - name: Update action.yml to use edge tagged container image
         if: github.ref == 'refs/heads/main'
@@ -126,22 +136,23 @@ jobs:
       - name: Show diff
         run: |
           ls -la
-          git diff PKGBUILD
+          git diff
-          git diff .SRCINFO
 
   release:
     name: Release
-    runs-on: ubuntu-latest
     needs: test
     if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Get branch/tag names
         id: branch-name
-        uses: tj-actions/branch-names@v5
+        uses: tj-actions/branch-names@v9
         with:
           strip_tag_prefix: "v"
 

.gitignore

@@ -0,0 +1 @@
+.idea

CHANGELOG.md

@@ -7,6 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.0.0] - 2026-01-16
+
+### Changed
+
+- Replace paru with yay - by @dcelasun
+
+## [2.4.0] - 2025-06-01
+
+### Added
+
+- Loading PGP Key support - by @dcelasun
+
+## [2.3.0] - 2025-05-27
+
+### Added
+
+- Copy all package files, not just PKGBUILD - by @dcelasun
+- Multilib support - by @dcelasun
+
+### Fixed
+
+- Keryring is not updated - by @cilki
+
+## [2.2.1] - 2024-02-19
+
+### Fixed
+
+- Can't pull docker image, so sorry guys
+
 ## [2.2.0] - 2022-08-05
 
 ### Added
@@ -98,7 +127,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.3.0...v2.4.0
+[2.3.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.2.1...v2.3.0
+[2.2.1]: https://github.com/hapakaien/archlinux-package-action/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/hapakaien/archlinux-package-action/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.3...v2.1.0

Dockerfile

@@ -1,5 +1,5 @@
 # Base image
-FROM docker.io/library/archlinux:base-devel
+FROM docker.io/library/archlinux:multilib-devel
 
 # Install dependencies
 RUN pacman -Syu --needed --noconfirm pacman-contrib namcap git
@@ -10,9 +10,9 @@ RUN useradd -m builder && \
 WORKDIR /home/builder
 USER builder
 
-# Install paru
+# Install yay
-RUN git clone https://aur.archlinux.org/paru-bin.git
+RUN git clone https://aur.archlinux.org/yay-bin.git
-RUN cd paru-bin && makepkg -si --noconfirm
+RUN cd yay-bin && makepkg -si --noconfirm
 
 # Copy files
 COPY LICENSE README.md /

README.md

@@ -1,6 +1,6 @@
 # Arch Linux's package tools action
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/hapakaien/archlinux-package-action/CI?label=CI&style=flat-square)](https://github.com/hapakaien/archlinux-package-action/actions) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/hapakaien/archlinux-package-action?style=flat-square)](https://github.com/hapakaien/archlinux-package-action/releases) [![GitHub](https://img.shields.io/github/license/hapakaien/archlinux-package-action?style=flat-square)](./LICENSE)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/heyhusen/archlinux-package-action/main.yml?style=flat-square&label=CI)](https://github.com/heyhusen/archlinux-package-action/actions) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/heyhusen/archlinux-package-action?style=flat-square)](https://github.com/heyhusen/archlinux-package-action/releases) [![GitHub](https://img.shields.io/github/license/heyhusen/archlinux-package-action?style=flat-square)](./LICENSE)
 
 This action allows running tools needed for creating Arch Linux (and AUR) package.
 Here's what this action can do:
@@ -22,7 +22,7 @@ Here's what this action can do:
 Following inputs can be used as `step.with` keys
 
 | Name                       | Type    | Default                       | Required | Description                                                                      |
-| -------------------------- | ------- | ------------------ | -------- | -------------------------------------------------------------------------------- |
+|----------------------------|---------|-------------------------------|----------|----------------------------------------------------------------------------------|
 | `path`                     | String  |                               | `false`  | Path where PKGBUILD is located. This path always located under $GITHUB_WORKSPACE |
 | `pkgver`                   | String  |                               | `false`  | Update `pkgver` on your PKGBUILD                                                 |
 | `pkgrel`                   | Integer |                               | `false`  | Update `pkgrel` on your PKGBUILD                                                 |
@@ -30,8 +30,10 @@ Following inputs can be used as `step.with` keys
 | `srcinfo`                  | Boolean | `false`                       | `false`  | Generate new .SRCINFO                                                            |
 | `namcap`                   | Boolean | `true`                        | `false`  | Validate PKGBUILD                                                                |
 | `flags`                    | String  | `-cfs --noconfirm`            | `false`  | Flags after `makepkg` command. Leave this empty will disable this command.       |
-| `aur`                      | Boolean | `false`            | `false`  | Resolve dependencies using paru                                                  |
+| `aur`                      | Boolean | `false`                       | `false`  | Resolve dependencies using yay                                                   |
 | `update_archlinux_keyring` | Boolean | `true`                        | `false`  | Update the archlinux keyring                                                     |
+| `pgpkeys`                  | String  |                               | `false`  | Comma-separated PGP public keys to be loaded before calling makepkg.             |
+| `pgpkeyserver`             | String  | `hkps://keyserver.ubuntu.com` | `false`  | PGP key server address.                                                          |
 
 ### Examples
 
@@ -54,7 +56,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: hapakaien/archlinux-package-action@v2
+        uses: heyhusen/archlinux-package-action@v2
 ```
 
 #### 2. Only generate .SRCINFO
@@ -74,7 +76,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: hapakaien/archlinux-package-action@v2
+        uses: heyhusen/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -98,7 +100,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: hapakaien/archlinux-package-action@v2
+        uses: heyhusen/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -122,7 +124,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: hapakaien/archlinux-package-action@v2
+        uses: heyhusen/archlinux-package-action@v2
         with:
           path: package
           flags: '-si --noconfirm'

action.yml

@@ -1,7 +1,7 @@
 # https://help.github.com/en/articles/metadata-syntax-for-github-actions
 name: "Arch Linux's package action"
 description: "GitHub Action to run Arch Linux's package tools"
-author: 'hapakaien'
+author: 'heyhusen'
 branding:
   icon: 'package'
   color: 'blue'
@@ -36,17 +36,25 @@ inputs:
     default: 'true'
     required: false
   aur:
-    description: 'Resolve dependencies using paru'
+    description: 'Resolve dependencies using yay'
     default: 'false'
     required: false
-  update_archlinux_keyring:
+  archlinux_keyring:
     description: 'Update archlinux-keyring'
     default: 'true'
     required: false
+  pgpkeys:
+    description: 'Comma-separated pgp keys'
+    default: ''
+    required: false
+  pgpkeyserver:
+    description: 'PGP key server'
+    default: 'hkps://keyserver.ubuntu.com'
+    required: false
 
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/hapakaien/archlinux-package-action:2'
+  image: Dockerfile
   args:
     - ${{ inputs.path }}
     - ${{ inputs.pkgver }}
@@ -56,4 +64,6 @@ runs:
     - ${{ inputs.flags }}
     - ${{ inputs.namcap }}
     - ${{ inputs.aur }}
-    - ${{ inputs.update_archlinux_keyring }}
+    - ${{ inputs.archlinux_keyring }}
+    - ${{ inputs.pgpkeys }}
+    - ${{ inputs.pgpkeyserver }}

entrypoint.sh

@@ -2,21 +2,38 @@
 set -e
 
 # Set path
-WORKPATH=$GITHUB_WORKSPACE/$INPUT_PATH
 HOME=/home/builder
-echo "::group::Copying files from $WORKPATH to $HOME/gh-action"
+echo "::group::Copying files from $GITHUB_WORKSPACE to $HOME/gh-action"
 # Set path permision
 cd $HOME
 mkdir gh-action
 cd gh-action
+
+if [[ -n $INPUT_PGPKEYS ]]; then
+  echo "::group::Loading PGP keys"
+  for key in ${INPUT_PGPKEYS//,/$'\n'}; do
+    gpg --keyserver $INPUT_PGPKEYSERVER --recv-keys $key
+  done
+  echo "::endgroup::"
+fi
+
+# If there is a custom path, we need to copy the whole repository
+# because we run "git diff" at several stages and without the entire
+# tree the output will be incorrect.
+if [[ -n $INPUT_PATH ]]; then
+  cp -rTfv "$GITHUB_WORKSPACE"/ ./
+  cd $INPUT_PATH
+else
+  # Without a custom path though, we can just grab the .git directory and the PKGBUILD.
   cp -rfv "$GITHUB_WORKSPACE"/.git ./
-cp -fv "$WORKPATH"/PKGBUILD ./
+  cp -fv "$GITHUB_WORKSPACE"/PKGBUILD ./
+fi
 echo "::endgroup::"
 
 # Update archlinux-keyring
 if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
     echo "::group::Updating archlinux-keyring"
-    pacman -S archlinux-keyring
+    sudo pacman -Syu --noconfirm archlinux-keyring
     echo "::endgroup::"
 fi
 
@@ -24,15 +41,15 @@ fi
 if [[ -n $INPUT_PKGVER ]]; then
     echo "::group::Updating pkgver on PKGBUILD"
     sed -i "s:^pkgver=.*$:pkgver=$INPUT_PKGVER:g" PKGBUILD
-    git diff PKGBUILD
+    git --no-pager diff PKGBUILD
     echo "::endgroup::"
 fi
 
-# Update pkgver
+# Update pkgrel
 if [[ -n $INPUT_PKGREL ]]; then
     echo "::group::Updating pkgrel on PKGBUILD"
     sed -i "s:^pkgrel=.*$:pkgrel=$INPUT_PKGREL:g" PKGBUILD
-    git diff PKGBUILD
+    git --no-pager diff PKGBUILD
     echo "::endgroup::"
 fi
 
@@ -40,7 +57,7 @@ fi
 if [[ $INPUT_UPDPKGSUMS == true ]]; then
     echo "::group::Updating checksums on PKGBUILD"
     updpkgsums
-    git diff PKGBUILD
+    git --no-pager diff PKGBUILD
     echo "::endgroup::"
 fi
 
@@ -48,7 +65,7 @@ fi
 if [[ $INPUT_SRCINFO == true ]]; then
     echo "::group::Generating new .SRCINFO based on PKGBUILD"
     makepkg --printsrcinfo >.SRCINFO
-    git diff .SRCINFO
+    git --no-pager diff .SRCINFO
     echo "::endgroup::"
 fi
 
@@ -59,11 +76,11 @@ if [[ $INPUT_NAMCAP == true ]]; then
     echo "::endgroup::"
 fi
 
-# Install depends using paru from aur
+# Install depends using yay from aur
 if [[ $INPUT_AUR == true ]]; then
-    echo "::group::Installing depends using paru"
+    echo "::group::Installing depends using yay"
     source PKGBUILD
-    paru -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
+    yay -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
     echo "::endgroup::"
 fi
 
@@ -74,6 +91,8 @@ if [[ -n $INPUT_FLAGS ]]; then
     echo "::endgroup::"
 fi
 
+WORKPATH=$GITHUB_WORKSPACE/$INPUT_PATH
+WORKPATH=${WORKPATH%/} # Remove trailing slash if $INPUT_PATH is empty
 echo "::group::Copying files from $HOME/gh-action to $WORKPATH"
 sudo cp -fv PKGBUILD "$WORKPATH"/PKGBUILD
 if [[ -e .SRCINFO ]]; then