Merge pull request #53 from heyhusen/release/v2.4.0

chore: release v2.4.0

.github/workflows/main.yml

@@ -26,21 +26,23 @@ jobs:
 
       - name: Get sample package
         run: |
-          mkdir visual-studio-code-bin
+          # Spotify 1:1.2.63.394-1
-          pushd visual-studio-code-bin
+          mkdir spotify
-          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/PKGBUILD
+          pushd spotify
-          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/.SRCINFO
+          wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/PKGBUILD
-          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/visual-studio-code-bin.install
+          wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/.SRCINFO
-          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/visual-studio-code-bin.sh
+          wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/LICENSE
+          wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/spotify.protocol
+          wget https://github.com/christian-heusel/aur/raw/5032e51a0b493cb7149264ec27a761ac85c81933/spotify/spotify.sh
           popd
       - name: Running test
         uses: ./
         with:
-          pkgver: '1.100.1'
+          pkgrel: 2
-          pkgrel: 1
           updpkgsums: true
           srcinfo: true
-          path: 'visual-studio-code-bin'
+          path: 'spotify'
+          pgpkeys: 'C85668DF69375001'
 
       - name: Show diff
         run: |

.gitignore

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

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.4.0] - 2025-06-01
+
+### Added
+
+- Loading PGP Key support - by @dcelasun
+
 ## [2.3.0] - 2025-05-27
 
 ### Added
@@ -115,7 +121,8 @@ 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.3.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

README.md

@@ -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                                                 |
@@ -32,6 +32,8 @@ Following inputs can be used as `step.with` keys
 | `flags`                    | String  | `-cfs --noconfirm`            | `false`  | Flags after `makepkg` command. Leave this empty will disable this command.       |
 | `aur`                      | Boolean | `false`                       | `false`  | Resolve dependencies using paru                                                  |
 | `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
 

action.yml

@@ -43,6 +43,14 @@ inputs:
     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'
@@ -57,3 +65,5 @@ runs:
     - ${{ inputs.namcap }}
     - ${{ inputs.aur }}
     - ${{ inputs.archlinux_keyring }}
+    - ${{ inputs.pgpkeys }}
+    - ${{ inputs.pgpkeyserver }}

entrypoint.sh

@@ -9,6 +9,14 @@ 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.
@@ -33,7 +41,7 @@ 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
 
@@ -41,7 +49,7 @@ fi
 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
 
@@ -49,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
 
@@ -57,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