Skip to content

Commit

Permalink
Use maintainer instead of name in defaults due to it's duplicate with…
Browse files Browse the repository at this point in the history
… name from workflows file.
  • Loading branch information
alee-ntap committed Nov 23, 2023
1 parent 55d7478 commit c49ad91
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions container/bin/build_source
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ apply_patches() (
version="$(yq -r '.version // ""' < "$1/pkg.yaml")"
[ -n "$version" ] || version="$(dpkg-parsechangelog --show-field Version)"
email="$(yq -r '.email // ""' < "$defaults_file")"
email="$(yq -r '.email // "'"$email"'"' < "$inputs_file")"
name="$(yq -r '.name // ""' < "$defaults_file")"
name="$(yq -r '.name // "'"$name"'"' < "$inputs_file")"
email="$(yq -r --arg name "$name" '.jobs[$name].with.email // "'"$email"'"' < "$inputs_file")"
maintainer="$(yq -r '.maintainer // ""' < "$defaults_file")"
maintainer="$(yq -r --arg name "$name" '.jobs[$name].with.maintainer // "'"$maintainer"'"' < "$inputs_file")"
distribution="$(yq -r '.distribution // ""' < "$defaults_file")"
distribution="$(yq -r '.distribution // "'"$distribution"'"' < "$inputs_file")"
distribution="$(yq -r --arg name "$name" '.jobs[$name].with.distribution // "'"$distribution"'"' < "$inputs_file")"
version_suffix="$(yq -r '.version_suffix // ""' < "$1/pkg.yaml")"
message="$(yq -r '.message // ""' < "$defaults_file")"
message="$(yq -r '.message // "'"$message"'"' < "$inputs_file")"
message="$(yq -r --arg name "$name" '.jobs[$name].with.message // "'"$message"'"' < "$inputs_file")"

DEBEMAIL="$email" DEBFULLNAME="$name" dch --newversion "$version$version_suffix" --distribution "$distribution" --force-distribution -- "$message"
DEBEMAIL="$email" DEBFULLNAME="$maintainer" dch --newversion "$version$version_suffix" --distribution "$distribution" --force-distribution -- "$message"

if [ -x "$1/exec.post" ]; then
SOURCE="$source" "$1/exec.post"
Expand Down
2 changes: 1 addition & 1 deletion container/build-defaults.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
email: "[email protected]"
name: "Garden Linux Builder"
maintainer: "Garden Linux Builder"
distribution: gardenlinux
message: "Rebuild for Garden Linux."

0 comments on commit c49ad91

Please sign in to comment.