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.3.5
+        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/datakrama/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
+        run: wget https://github.com/${{ github.repository_owner }}/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
 
       - name: Running test
         uses: ./
@@ -42,18 +42,25 @@ jobs:
           git diff .SRCINFO
 
   publish:
-    name: Publish container image
+    name: Publish OCI image
     needs: pretest
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v4
 
-      - name: OCI meta
+      - name: Log in to ghcr.io
-        id: meta
+        uses: redhat-actions/podman-login@v1
-        uses: docker/metadata-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: OCI metadata
+        id: metadata
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
@@ -64,43 +71,48 @@ jobs:
             type=semver,pattern={{major}}
             type=sha
 
-      - name: Set up QEMU
+      - name: Build image
-        uses: docker/setup-qemu-action@v1
+        id: build
-
+        uses: redhat-actions/buildah-build@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to GHCR
-        uses: docker/login-action@v1
         with:
+          tags: ${{ steps.metadata.outputs.tags }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          containerfiles: |
+            ./Dockerfile
+          extra-args: |
+            --pull
+
+      - name: Push to ghcr.io
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build.outputs.image }}
+          tags: ${{ steps.build.outputs.tags }}
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          extra-args: |
-          password: ${{ secrets.GITHUB_TOKEN }}
+            --disable-content-trust
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
 
   test:
-    name: Test (with prebuilt Container Image)
+    name: Test (with prebuilt OCI Image)
     needs: publish
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
+        uses: actions/checkout@v4
 
       - name: Get sample PKGBUILD
-        run: wget https://github.com/datakrama/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
@@ -125,11 +137,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.5
+        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,61 @@ 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
+
+- CI can not read changelog
+
+## [2.0.1] - 2022-02-02
+
+### Fixed
+
+- Wrong OCI image tag at action.yml
+
+## [2.0.0] - 2022-02-02
+
+### Changed
+
+- Move repo from hapakaien to hapakaien
+- `builder` user is added to sudoers directly instead of via the wheel group
+- Replace Docker with Buildah in CI
+
+### Fixed
+
+- `builder` is not in the sudoers file
+
 ## [1.1.1] - 2021-10-26
 
 ### Fixed
@@ -49,10 +104,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/datakrama/archlinux-package-action/compare/v1.1.1...HEAD
+[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.2.0...HEAD
-[1.1.1]: https://github.com/datakrama/archlinux-package-action/compare/v1.1.0...v1.1.1
+[2.2.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.1.1...v2.2.0
-[1.1.0]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.3...v1.1.0
+[2.1.1]: https://github.com/hapakaien/archlinux-package-action/compare/v2.1.0...v2.1.1
-[1.0.3]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.2...v1.0.3
+[2.1.0]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.3...v2.1.0
-[1.0.2]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.1...v1.0.2
+[2.0.3]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.2...v2.0.3
-[1.0.1]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.0...v1.0.1
+[2.0.2]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.1...v2.0.2
-[1.0.0]: https://github.com/datakrama/archlinux-package-action/releases/tag/v1.0.0
+[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
+[1.1.1]: https://github.com/hapakaien/archlinux-package-action/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/hapakaien/archlinux-package-action/compare/v1.0.3...v1.1.0
+[1.0.3]: https://github.com/hapakaien/archlinux-package-action/compare/v1.0.2...v1.0.3
+[1.0.2]: https://github.com/hapakaien/archlinux-package-action/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/hapakaien/archlinux-package-action/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/hapakaien/archlinux-package-action/releases/tag/v1.0.0

Dockerfile

@@ -5,11 +5,14 @@ FROM docker.io/library/archlinux:base-devel
 RUN pacman -Syu --needed --noconfirm pacman-contrib namcap git
 
 # Setup user
-RUN useradd --create-home --shell /bin/bash builder && \
+RUN useradd -m builder && \
-    passwd --delete builder && \
+    echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
-    chown -vR builder:builder /home/builder && \
+WORKDIR /home/builder
-    usermod -aG wheel builder && \
+USER builder
-    echo 'wheel  ALL=(ALL:ALL) ALL' >> /etc/sudoers
+
+# 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 /

README.md

@@ -1,8 +1,8 @@
 # Arch Linux's package tools action
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/datakrama/archlinux-package-action/CI?label=CI&style=flat-square)](https://github.com/datakrama/archlinux-package-action/actions) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/datakrama/archlinux-package-action?style=flat-square)](https://github.com/datakrama/archlinux-package-action/releases) [![GitHub](https://img.shields.io/github/license/datakrama/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. 
+This action allows running tools needed for creating Arch Linux (and AUR) package.
 Here's what this action can do:
 
 - Update `pkgver`, `pkgrel`, or checksums on PKGBUILD file
@@ -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: datakrama/archlinux-package-action@v1
+        uses: heyhusen/archlinux-package-action@v2
 ```
 
 #### 2. Only generate .SRCINFO
@@ -72,7 +74,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: heyhusen/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -96,7 +98,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: heyhusen/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -120,7 +122,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        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: 'datakrama'
+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/datakrama/archlinux-package-action:1'
+  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

@@ -2,15 +2,24 @@
 set -e
 
 # Set path
-echo "::group::Copying file from $WORKPATH to /tmp/gh-action"
 WORKPATH=$GITHUB_WORKSPACE/$INPUT_PATH
+HOME=/home/builder
+echo "::group::Copying files from $WORKPATH to $HOME/gh-action"
 # Set path permision
-sudo -u builder mkdir /tmp/gh-action
+cd $HOME
-sudo -u builder cp -rfv "$GITHUB_WORKSPACE"/.git /tmp/gh-action/.git
+mkdir gh-action
-sudo -u builder cp -fv "$WORKPATH"/PKGBUILD /tmp/gh-action/PKGBUILD
+cd gh-action
-cd /tmp/gh-action
+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"
@@ -30,7 +39,7 @@ fi
 # Update checksums
 if [[ $INPUT_UPDPKGSUMS == true ]]; then
     echo "::group::Updating checksums on PKGBUILD"
-    sudo -u builder updpkgsums
+    updpkgsums
     git diff PKGBUILD
     echo "::endgroup::"
 fi
@@ -38,7 +47,7 @@ fi
 # Generate .SRCINFO
 if [[ $INPUT_SRCINFO == true ]]; then
     echo "::group::Generating new .SRCINFO based on PKGBUILD"
-    sudo -u builder makepkg --printsrcinfo > .SRCINFO
+    makepkg --printsrcinfo >.SRCINFO
     git diff .SRCINFO
     echo "::endgroup::"
 fi
@@ -50,16 +59,24 @@ if [[ $INPUT_NAMCAP == true ]]; then
     echo "::endgroup::"
 fi
 
-# Run makepkg
+# Install depends using paru from aur
-if [[ -n $INPUT_FLAGS ]]; then
+if [[ $INPUT_AUR == true ]]; then
-    echo "::group::Running makepkg with flags"
+    echo "::group::Installing depends using paru"
-    sudo -u builder makepkg $INPUT_FLAGS
+    source PKGBUILD
+    paru -Syu --removemake --needed --noconfirm "${depends[@]}" "${makedepends[@]}"
     echo "::endgroup::"
 fi
 
-echo "::group::Copying files from /tmp/gh-action to $WORKPATH"
+# Run makepkg
-cp -fv /tmp/gh-action/PKGBUILD "$WORKPATH"/PKGBUILD
+if [[ -n $INPUT_FLAGS ]]; then
-if [[ -e /tmp/gh-action/.SRCINFO ]]; then
+    echo "::group::Running makepkg with flags"
-    cp -fv /tmp/gh-action/.SRCINFO "$WORKPATH"/.SRCINFO
+    makepkg $INPUT_FLAGS
+    echo "::endgroup::"
+fi
+
+echo "::group::Copying files from $HOME/gh-action to $WORKPATH"
+sudo cp -fv PKGBUILD "$WORKPATH"/PKGBUILD
+if [[ -e .SRCINFO ]]; then
+    sudo cp -fv .SRCINFO "$WORKPATH"/.SRCINFO
 fi
 echo "::endgroup::"