Merge pull request #14 from hapakaien/v2

chore: release v2.0.2

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.4.0
 
       - 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/hapakaien/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
 
       - name: Running test
         uses: ./
@@ -42,17 +42,24 @@ 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
+        uses: actions/checkout@v2.4.0
 
-      - name: OCI meta
+      - name: Log in to ghcr.io
-        id: meta
+        uses: redhat-actions/podman-login@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: OCI metadata
+        id: metadata
         uses: docker/metadata-action@v3
         with:
           images: ghcr.io/${{ github.repository }}
@@ -64,38 +71,37 @@ 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.4
+        uses: actions/checkout@v2.4.0
 
       - name: Get sample PKGBUILD
-        run: wget https://github.com/datakrama/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
+        run: wget https://github.com/hapakaien/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
 
       - name: Update action.yml to use edge tagged container image
         if: github.ref == 'refs/heads/main'
@@ -125,7 +131,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
 
       - name: Get branch/tag names
         id: branch-name

CHANGELOG.md

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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
+
+- Wrong `.git` folder when using `path` parameter
+
 ## [1.1.0] - 2021-10-02
 
 ### Added
@@ -43,8 +73,13 @@ 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.0...HEAD
+[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.2...HEAD
-[1.0.3]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.2...v1.0.3
+[2.0.2]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.1...v2.0.2
-[1.0.2]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.1...v1.0.2
+[2.0.1]: https://github.com/hapakaien/archlinux-package-action/compare/v2.0.0...v2.0.1
-[1.0.1]: https://github.com/datakrama/archlinux-package-action/compare/v1.0.0...v1.0.1
+[2.0.0]: https://github.com/hapakaien/archlinux-package-action/compare/v1.1.1...v2.0.0
-[1.0.0]: https://github.com/datakrama/archlinux-package-action/releases/tag/v1.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,10 @@ 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
 
 # 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/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/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)
 
 This action allows running tools needed for creating Arch Linux (and AUR) package. 
 Here's what this action can do:
@@ -52,7 +52,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: hapakaien/archlinux-package-action@v2
 ```
 
 #### 2. Only generate .SRCINFO
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: hapakaien/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -96,7 +96,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: hapakaien/archlinux-package-action@v2
         with:
           flags: ''
           namcap: false
@@ -120,7 +120,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Validate package
-        uses: datakrama/archlinux-package-action@v1
+        uses: hapakaien/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: 'hapakaien'
 branding:
   icon: 'package'
   color: 'blue'
@@ -38,7 +38,7 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/datakrama/archlinux-package-action:1'
+  image: 'docker://ghcr.io/hapakaien/archlinux-package-action:2'
   args:
     - ${{ inputs.path }}
     - ${{ inputs.pkgver }}

entrypoint.sh

@@ -2,13 +2,15 @@
 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 "$WORKPATH"/.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 ./
+sudo cp -fv "$WORKPATH"/PKGBUILD ./
 echo "::endgroup::"
 
 # Update pkgver
@@ -30,7 +32,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 +40,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
@@ -53,13 +55,13 @@ fi
 # Run makepkg
 if [[ -n $INPUT_FLAGS ]]; then
     echo "::group::Running makepkg with flags"
-    sudo -u builder makepkg $INPUT_FLAGS
+    makepkg $INPUT_FLAGS
     echo "::endgroup::"
 fi
 
-echo "::group::Copying files from /tmp/gh-action to $WORKPATH"
+echo "::group::Copying files from $HOME/gh-action to $WORKPATH"
-cp -fv /tmp/gh-action/PKGBUILD "$WORKPATH"/PKGBUILD
+sudo cp -fv PKGBUILD "$WORKPATH"/PKGBUILD
-if [[ -e /tmp/gh-action/.SRCINFO ]]; then
+if [[ -e .SRCINFO ]]; then
-    cp -fv /tmp/gh-action/.SRCINFO "$WORKPATH"/.SRCINFO
+    sudo cp -fv .SRCINFO "$WORKPATH"/.SRCINFO
 fi
 echo "::endgroup::"