Merge pull request #29 from hapakaien/release/v2.2.0

chore: release v2.2.0

.github/workflows/main.yml

@@ -60,7 +60,7 @@ jobs:
 
       - name: OCI metadata
         id: metadata
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
@@ -106,7 +106,13 @@ jobs:
       - name: Update action.yml to use edge tagged container image
         if: github.ref == 'refs/heads/main'
         run: |
-          sed -i 's/.*image\:.*/  image\: \"docker\:\/\/ghcr.io\/${{ github.repository_owner }}\/${{ github.event.repository.name }}\:edge\"/' action.yml
+          REPOSITORY_OWNER=${{ github.repository_owner }}
+          REPOSITORY_OWNER=$(echo $REPOSITORY_OWNER | tr '[:upper:]' '[:lower:]')
+          
+          REPOSITORY_NAME=${{ github.event.repository.name }}
+          REPOSITORY_NAME=$(echo $REPOSITORY_NAME | tr '[:upper:]' '[:lower:]')
+          
+          sed -i "s/.*image\:.*/  image\: \"docker\:\/\/ghcr.io\/${REPOSITORY_OWNER}\/${REPOSITORY_NAME}\:edge\"/" action.yml
           cat action.yml
 
       - name: Running test

CHANGELOG.md

@@ -7,11 +7,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.0] - 2022-08-05
+
+### Added
+
+- Option to update archlinux-keyring - by @ReenigneArcher
+- Make repository name lowercase - by @ReenigneArcher
+
+## [2.1.1] - 2022-05-15
+
+### Fixed
+
+- Wrong conditional using paru
+
 ## [2.1.0] - 2022-05-05
 
 ### Added
 
-- Option to resolve deps using paru (from AUR)
+- Option to resolve deps using paru (from AUR) - by @kamack38
 
 ## [2.0.3] - 2022-02-02
 
@@ -85,7 +98,9 @@ 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.1.0...HEAD
+[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.2.0...HEAD
+[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
 [2.0.3]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.1...v2.0.2

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                                                 |
@@ -31,6 +31,7 @@ Following inputs can be used as `step.with` keys
 | `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                                                  |
+| `update_archlinux_keyring` | Boolean | `true`             | `false`  | Update the archlinux keyring                                                     |
 
 ### Examples
 

action.yml

@@ -39,6 +39,10 @@ inputs:
     description: 'Resolve dependencies using paru'
     default: 'false'
     required: false
+  update_archlinux_keyring:
+    description: 'Update archlinux-keyring'
+    default: 'true'
+    required: false
 
 runs:
   using: 'docker'
@@ -52,3 +56,4 @@ runs:
     - ${{ inputs.flags }}
     - ${{ inputs.namcap }}
     - ${{ inputs.aur }}
+    - ${{ inputs.update_archlinux_keyring }}

entrypoint.sh

@@ -13,6 +13,13 @@ cp -rfv "$GITHUB_WORKSPACE"/.git ./
 cp -fv "$WORKPATH"/PKGBUILD ./
 echo "::endgroup::"
 
+# Update archlinux-keyring
+if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
+    echo "::group::Updating archlinux-keyring"
+    pacman -S archlinux-keyring
+    echo "::endgroup::"
+fi
+
 # Update pkgver
 if [[ -n $INPUT_PKGVER ]]; then
     echo "::group::Updating pkgver on PKGBUILD"
@@ -53,7 +60,7 @@ if [[ $INPUT_NAMCAP == true ]]; then
 fi
 
 # Install depends using paru from aur
-if [[ -n $INPUT_AUR ]]; then
+if [[ $INPUT_AUR == true ]]; then
     echo "::group::Installing depends using paru"
     source PKGBUILD
     paru -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"