Skip to content

Commit

Permalink
fix: bug that --vendor gets --description value #9 (#10)
Browse files Browse the repository at this point in the history
* fix: bug that `--vendor` gets `--description` value #9

* chore: change desc parameter to multiline string #9

* chore: bump minor #9
  • Loading branch information
jiro4989 authored Mar 15, 2023
1 parent d803488 commit 2818146
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ jobs:
maintainer: jiro4989
version: 'v1.0.0'
arch: 'x86_64'
desc: 'test package'
desc: |
This is sample package. This is sample package.
This is sample package.
This is sample package.
- run: |
docker run --rm -v $PWD:/work -t centos:7 bash -c 'rpm -Uvh /work/*.rpm && testbin'
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ inputs:
default: ''
runs:
using: 'docker'
image: 'docker://jiro4989/build-rpm-action:2.2.0'
image: 'docker://jiro4989/build-rpm-action:2.3.0'

# Ref: https://haya14busa.github.io/github-action-brandings/
# TODO: update branding if you want.
Expand Down
5 changes: 5 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ set -eux

INPUT_VERSION="$(echo "$INPUT_VERSION" | sed -E "s,^refs/tags/,,")"

if [ "$INPUT_VENDOR" = "" ]; then
INPUT_VENDOR="$INPUT_MAINTAINER"
fi

/replacetool \
--specfile:/template.spec \
--summary:"$INPUT_SUMMARY" \
Expand Down Expand Up @@ -33,6 +37,7 @@ readonly RPMBUILD_SPEC_DIR="$RPMBUILD_DIR/SPECS"
mv tmp.tar.gz "$RPMBUILD_SOURCE_DIR"

cp -p template.spec "$RPMBUILD_SPEC_DIR"
cat template.spec
rpmbuild -bb "$RPMBUILD_SPEC_DIR/template.spec"
)

Expand Down

0 comments on commit 2818146

Please sign in to comment.