Merge pull request #51 from heyhusen/release/v2.3.0

chore: release v2.3.0

.github/workflows/main.yml

@@ -17,29 +17,35 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Update action.yml to build locally
         run: |
           sed -i 's/.*image\:.*/  image\: \"Dockerfile\"/' action.yml
           cat action.yml
 
-      - name: Get sample PKGBUILD
+      - name: Get sample package
-        run: wget https://github.com/hapakaien/plenti-bin/raw/f5ffaaee02a2119aa16f6b7a27e87e198e096b47/PKGBUILD
+        run: |
-
+          mkdir visual-studio-code-bin
+          pushd visual-studio-code-bin
+          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/PKGBUILD
+          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/.SRCINFO
+          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/visual-studio-code-bin.install
+          wget https://github.com/dcelasun/pkgbuilds/raw/ee68e4c19c40a0a36a50e289259fcfd94f43786d/visual-studio-code-bin/visual-studio-code-bin.sh
+          popd
       - name: Running test
         uses: ./
         with:
-          pkgver: '0.4.26'
+          pkgver: '1.100.1'
-          pkgrel: 2
+          pkgrel: 1
           updpkgsums: true
           srcinfo: true
+          path: 'visual-studio-code-bin'
 
       - name: Show diff
         run: |
           ls -la
-          git diff PKGBUILD
+          git diff
-          git diff .SRCINFO
 
   publish:
     name: Publish OCI image
@@ -49,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
@@ -60,7 +66,7 @@ jobs:
 
       - name: OCI metadata
         id: metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           tags: |
@@ -98,10 +104,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        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'
@@ -126,8 +132,7 @@ jobs:
       - name: Show diff
         run: |
           ls -la
-          git diff PKGBUILD
+          git diff
-          git diff .SRCINFO
 
   release:
     name: Release
@@ -137,11 +142,11 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        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,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.3.0] - 2025-05-27
+
+### Added
+
+- Copy all package files, not just PKGBUILD - by @dcelasun
+- Multilib support - by @dcelasun
+
+### Fixed
+
+- Keryring is not updated - by @cilki
+
+## [2.2.1] - 2024-02-19
+
+### Fixed
+
+- Can't pull docker image, so sorry guys
+
 ## [2.2.0] - 2022-08-05
 
 ### Added
@@ -98,7 +115,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.2.0...HEAD
+[Unreleased]: https://github.com/hapakaien/archlinux-package-action/compare/v2.3.0...HEAD
+[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
 [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

Dockerfile

@@ -1,5 +1,5 @@
 # Base image
-FROM docker.io/library/archlinux:base-devel
+FROM docker.io/library/archlinux:multilib-devel
 
 # Install dependencies
 RUN pacman -Syu --needed --noconfirm pacman-contrib namcap git

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:
@@ -54,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
@@ -74,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
@@ -98,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
@@ -122,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'
@@ -39,14 +39,14 @@ inputs:
     description: 'Resolve dependencies using paru'
     default: 'false'
     required: false
-  update_archlinux_keyring:
+  archlinux_keyring:
     description: 'Update archlinux-keyring'
     default: 'true'
     required: false
 
 runs:
   using: 'docker'
-  image: 'docker://ghcr.io/hapakaien/archlinux-package-action:2'
+  image: Dockerfile
   args:
     - ${{ inputs.path }}
     - ${{ inputs.pkgver }}
@@ -56,4 +56,4 @@ runs:
     - ${{ inputs.flags }}
     - ${{ inputs.namcap }}
     - ${{ inputs.aur }}
-    - ${{ inputs.update_archlinux_keyring }}
+    - ${{ inputs.archlinux_keyring }}

entrypoint.sh

@@ -2,21 +2,30 @@
 set -e
 
 # Set path
-WORKPATH=$GITHUB_WORKSPACE/$INPUT_PATH
 HOME=/home/builder
-echo "::group::Copying files from $WORKPATH to $HOME/gh-action"
+echo "::group::Copying files from $GITHUB_WORKSPACE to $HOME/gh-action"
 # Set path permision
 cd $HOME
 mkdir gh-action
 cd gh-action
-cp -rfv "$GITHUB_WORKSPACE"/.git ./
+
-cp -fv "$WORKPATH"/PKGBUILD ./
+# 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.
+if [[ -n $INPUT_PATH ]]; then
+  cp -rTfv "$GITHUB_WORKSPACE"/ ./
+  cd $INPUT_PATH
+else
+  # Without a custom path though, we can just grab the .git directory and the PKGBUILD.
+  cp -rfv "$GITHUB_WORKSPACE"/.git ./
+  cp -fv "$GITHUB_WORKSPACE"/PKGBUILD ./
+fi
 echo "::endgroup::"
 
 # Update archlinux-keyring
 if [[ $INPUT_ARCHLINUX_KEYRING == true ]]; then
     echo "::group::Updating archlinux-keyring"
-    pacman -S archlinux-keyring
+    sudo pacman -Syu --noconfirm archlinux-keyring
     echo "::endgroup::"
 fi
 
@@ -28,7 +37,7 @@ if [[ -n $INPUT_PKGVER ]]; then
     echo "::endgroup::"
 fi
 
-# Update pkgver
+# Update pkgrel
 if [[ -n $INPUT_PKGREL ]]; then
     echo "::group::Updating pkgrel on PKGBUILD"
     sed -i "s:^pkgrel=.*$:pkgrel=$INPUT_PKGREL:g" PKGBUILD
@@ -74,6 +83,8 @@ if [[ -n $INPUT_FLAGS ]]; then
     echo "::endgroup::"
 fi
 
+WORKPATH=$GITHUB_WORKSPACE/$INPUT_PATH
+WORKPATH=${WORKPATH%/} # Remove trailing slash if $INPUT_PATH is empty
 echo "::group::Copying files from $HOME/gh-action to $WORKPATH"
 sudo cp -fv PKGBUILD "$WORKPATH"/PKGBUILD
 if [[ -e .SRCINFO ]]; then