Skip to content

Commit

Permalink
Directly use and in the inputs and pass the variables to podman run.
Browse files Browse the repository at this point in the history
  • Loading branch information
alee-ntap committed Nov 8, 2023
1 parent ac28e26 commit 8f02828
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/build_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ on:
dependencies:
type: string
default: ""
email:
debemail:
type: string
default: "[email protected]"
name:
debname:
type: string
default: "Garden Linux Builder"
distribution:
Expand All @@ -41,8 +41,8 @@ on:
default: "gl0"

env:
INPUT_EMAIL: ${{ inputs.email }}
INPUT_NAME: ${{ inputs.name }}
INPUT_DEBEMAIL: ${{ inputs.debemail }}
INPUT_DEBNAME: ${{ inputs.debname }}
INPUT_DIST: ${{ inputs.distribution }}
INPUT_MESSAGE: ${{ inputs.message }}
INPUT_BUILD_OPTIONS: ${{ inputs.build_options }}
Expand Down Expand Up @@ -86,8 +86,8 @@ jobs:
id: build
run: |
pkg="$(podman run \
-e EMAIL='${{ env.INPUT_EMAIL }}' \
-e NAME='${{ env.INPUT_NAME }}' \
-e DEBEMAIL='${{ env.INPUT_DEBEMAIL }}' \
-e DEBNAME='${{ env.INPUT_DEBNAME }}' \
-e DIST='${{ env.INPUT_DIST }}' \
-e MESSAGE='${{ env.INPUT_MESSAGE }}' \
-e BUILD_OPTIONS='${{ env.INPUT_BUILD_OPTIONS }}' \
Expand Down Expand Up @@ -169,8 +169,8 @@ jobs:
run: |
mkdir output
pkg="$(podman run \
-e EMAIL='${{ env.INPUT_EMAIL }}' \
-e NAME='${{ env.INPUT_NAME }}' \
-e DEBEMAIL='${{ env.INPUT_DEBEMAIL }}' \
-e DEBNAME='${{ env.INPUT_DEBNAME }}' \
-e DIST='${{ env.INPUT_DIST }}' \
-e MESSAGE='${{ env.INPUT_MESSAGE }}' \
-e BUILD_OPTIONS='${{ env.INPUT_BUILD_OPTIONS }}' \
Expand Down
2 changes: 1 addition & 1 deletion container/bin/build_source
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ apply_patches() (
[ -n "$version" ] || version="$(dpkg-parsechangelog --show-field Version)"
version_suffix="$VERSION_SUFFIX"

DEBEMAIL="$EMAIL" DEBFULLNAME="$NAME" dch --newversion "$version$version_suffix" --distribution "$DIST" --force-distribution -- "$MESSAGE"
dch --newversion "$version$version_suffix" --distribution "$DIST" --force-distribution -- "$MESSAGE"

if [ -x "$1/exec.post" ]; then
SOURCE="$source" "$1/exec.post"
Expand Down

0 comments on commit 8f02828

Please sign in to comment.