Skip to content

Commit

Permalink
Merge pull request #672 from serokell/krendelhoff/chore-fix-epel-chroot
Browse files Browse the repository at this point in the history
[#671] Fix epel chroot name
  • Loading branch information
pasqu4le authored Jun 14, 2023
2 parents 46c0b9c + 8c09c2b commit 431c4c1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/build/fedora/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def sign_fedora(args: Arguments):

for f in artifacts:
if f.endswith(".src.rpm"):
subprocess.call(
subprocess.check_call(
f'rpmsign --define="%_gpg_name {identity}" --define="%__gpg {gpg}" --addsign {f}',
shell=True,
)
Expand Down
4 changes: 2 additions & 2 deletions docker/build/fedora/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def upload_fedora(args: Arguments):
destination = args.destination

if destination == "epel":
chroots = ["epel-x86_64"]
chroots = ["epel-7-x86_64"]
else:
archs = ["x86_64", "aarch64"]
chroots = [
Expand All @@ -54,7 +54,7 @@ def upload_fedora(args: Arguments):
chroots = " ".join(f"-r {chroot}" for chroot in chroots)

for f in filter(lambda x: x.endswith(".src.rpm"), packages):
subprocess.call(
subprocess.check_call(
f"copr-cli build {chroots} --nowait {copr_project} {f}",
shell=True,
)
Expand Down
4 changes: 2 additions & 2 deletions docker/build/ubuntu/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ def sign_ubuntu(args: Arguments):

for f in artifacts:
if f.endswith(".changes"):
subprocess.call(
subprocess.check_call(
f"sed -i 's/^Changed-By: .*$/Changed-By: {identity}/' {f}", shell=True
)
subprocess.call(f"debsign {f}", shell=True)
subprocess.check_call(f"debsign {f}", shell=True)


def main(args: Optional[Arguments] = None):
Expand Down
2 changes: 1 addition & 1 deletion docker/build/ubuntu/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def upload_ubuntu(args: Arguments):
packages = get_artifact_list(args)

for f in filter(lambda x: x.endswith(".changes"), packages):
subprocess.call(
subprocess.check_call(
f"execute-dput -c dput.cfg {launchpad_ppa} {f}",
shell=True,
)
Expand Down

0 comments on commit 431c4c1

Please sign in to comment.