Merge pull request #43 from heyhusen/release/v2.2.1

chore: release v2.2.1

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v4
 
       - name: Update action.yml to build locally
         run: |
@@ -25,7 +25,7 @@ jobs:
           cat action.yml
 
       - 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: Running test
         uses: ./
@@ -49,7 +49,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v4
 
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
@@ -60,7 +60,7 @@ jobs:
 
       - name: OCI metadata
         id: metadata
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
@@ -98,15 +98,21 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v4
 
       - 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'
         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
@@ -131,11 +137,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v4
 
       - name: Get branch/tag names
         id: branch-name
-        uses: tj-actions/branch-names@v5
+        uses: tj-actions/branch-names@v8
         with:
           strip_tag_prefix: "v"
 

CHANGELOG.md

@@ -7,6 +7,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.1] - 2024-02-19
+
+### Fixed
+
+- Can't pull docker image, so sorry guys
+
+## [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) - by @kamack38
+
+## [2.0.3] - 2022-02-02
+
+### Fixed
+
+- Copied PKGBUILD file has wrong permission
+
 ## [2.0.2] - 2022-02-02
 
 ### Fixed
@@ -73,7 +104,11 @@ 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.0.2...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
 [2.0.1]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/hapakaien/archlinux-package-action/compare/v1.1.1...v2.0.0

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

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:
@@ -21,15 +21,17 @@ Here's what this action can do:
 
 Following inputs can be used as `step.with` keys
 
-| Name              | Type      | Default                       | Required  | Description                           |
+| Name                       | Type    | Default            | Required | Description                                                                      |
-|-------------------|-----------|-------------------------------|-----------|---------------------------------------|
+| -------------------------- | ------- | ------------------ | -------- | -------------------------------------------------------------------------------- |
-| `path`            | String    |                               | `false`   | Path where PKGBUILD is located. This path always located under $GITHUB_WORKSPACE |
+| `path`                     | String  |                    | `false`  | Path where PKGBUILD is located. This path always located under $GITHUB_WORKSPACE |
-| `pkgver`          | String    |                               | `false`   | Update `pkgver` on your PKGBUILD |
+| `pkgver`                   | String  |                    | `false`  | Update `pkgver` on your PKGBUILD                                                 |
-| `pkgrel`          | Integer   |                               | `false`   | Update `pkgrel` on your PKGBUILD |
+| `pkgrel`                   | Integer |                    | `false`  | Update `pkgrel` on your PKGBUILD                                                 |
-| `updpkgsums`      | Boolean   | `false`                       | `false`   | Update checksums on your PKGBUILD     |
+| `updpkgsums`               | Boolean | `false`            | `false`  | Update checksums on your PKGBUILD                                                |
-| `srcinfo`         | Boolean   | `false`                       | `false`   | Generate new .SRCINFO                 |
+| `srcinfo`                  | Boolean | `false`            | `false`  | Generate new .SRCINFO                                                            |
-| `namcap`          | Boolean   | `true`                        | `false`   | Validate PKGBUILD                     |
+| `namcap`                   | Boolean | `true`             | `false`  | Validate PKGBUILD                                                                |
-| `flags`           | String    | `-cfs --noconfirm`            | `false`   | Flags after `makepkg` command. Leave this empty will disable this command. |
+| `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
 
@@ -52,7 +54,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
@@ -72,7 +74,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
@@ -96,7 +98,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
@@ -120,7 +122,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'
@@ -35,10 +35,18 @@ inputs:
     description: 'Validate package with namcap'
     default: 'true'
     required: false
+  aur:
+    description: 'Resolve dependencies using paru'
+    default: 'false'
+    required: false
+  update_archlinux_keyring:
+    description: 'Update archlinux-keyring'
+    default: 'true'
+    required: false
 
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/hapakaien/archlinux-package-action:2'
+  image: 'docker://ghcr.io/heyhusen/archlinux-package-action:2'
   args:
     - ${{ inputs.path }}
     - ${{ inputs.pkgver }}
@@ -47,3 +55,5 @@ runs:
     - ${{ inputs.srcinfo }}
     - ${{ inputs.flags }}
     - ${{ inputs.namcap }}
+    - ${{ inputs.aur }}
+    - ${{ inputs.update_archlinux_keyring }}

entrypoint.sh

@@ -10,9 +10,16 @@ cd $HOME
 mkdir gh-action
 cd gh-action
 cp -rfv "$GITHUB_WORKSPACE"/.git ./
-sudo cp -fv "$WORKPATH"/PKGBUILD ./
+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"
@@ -40,7 +47,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 +59,14 @@ if [[ $INPUT_NAMCAP == true ]]; then
     echo "::endgroup::"
 fi
 
+# Install depends using paru from aur
+if [[ $INPUT_AUR == true ]]; 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"