1
1
Fork 0
mirror of https://code.mensbeam.com/MensBeam/Arsse.git synced 2024-12-23 05:54:55 +00:00

Rough in RPM key management requirements

This commit is contained in:
J. King 2021-07-22 20:07:29 -04:00
parent eddb126ec8
commit 9cc741b72f

View file

@ -409,7 +409,7 @@ class RoboFile extends \Robo\Tasks {
*/ */
public function packageBin(string $commit = null, string $target = null): Result { public function packageBin(string $commit = null, string $target = null): Result {
if (!$this->toolExists("git", "build", "sudo")) { if (!$this->toolExists("git", "build", "sudo")) {
throw new \Exception("Git OBS-Build are required in PATH to produce packages"); throw new \Exception("Git and OBS-Build are required in PATH to produce packages");
} }
[$commit, $version] = $this->commitVersion($commit); [$commit, $version] = $this->commitVersion($commit);
$tarball = BASE."release/$version/arsse-$version.tar.gz"; $tarball = BASE."release/$version/arsse-$version.tar.gz";
@ -428,9 +428,15 @@ class RoboFile extends \Robo\Tasks {
// glob the recipe and use the first one found // glob the recipe and use the first one found
$recipe = glob($dir.$s['recipe']); $recipe = glob($dir.$s['recipe']);
if (!$recipe) { if (!$recipe) {
$this->say("Build target '$target' skipped"); $this->yell("Build target '$target' skipped: recipe file not available");
continue; continue;
} }
if ($s['keys']) {
if (!$this->toolExists("rpm", "rpmkeys")) {
$this->yell("Build target '$target' skipped: RPM tools not available");
continue;
}
}
$recipe = escapeshellarg($recipe[0]); $recipe = escapeshellarg($recipe[0]);
$dist = "--dist ".escapeshellarg($s['dist']); $dist = "--dist ".escapeshellarg($s['dist']);
$repo = implode(" ", array_map(function($repo) { $repo = implode(" ", array_map(function($repo) {