diff --git a/bin/publish-latest-branch-build.php b/bin/publish-latest-branch-build.php index 4a79382..53df0d6 100755 --- a/bin/publish-latest-branch-build.php +++ b/bin/publish-latest-branch-build.php @@ -1,259 +1,261 @@ #!/usr/bin/env php getABI()) { $telegram_apk_lines[] = sprintf( "APK for **%s**:", TelegramStupidSDK::escapeMarkdownV2($generated_apk->getABI()), ); } foreach ($generated_apk->getTelegramCommentLines() as $apk_line) { $telegram_apk_lines[] = $apk_line; //$telegram_apk_lines[] = ""; } $telegram_apk_lines[] = ""; foreach ($generated_apk->getPhorgeCommentLines() as $apk_line) { $phorge_apk_lines[] = $apk_line; $phorge_apk_lines[] = ""; } + + // Send message to Phorge. + echo "Adding bipbop Comment to $phorge_document_id\n"; + shell_exec(sprintf( + "~/bin/phab-comment.php %s %s %s", + escapeshellarg($phorge_document_id), + escapeshellarg($generated_apk->getURL()), + escapeshellarg($generated_apk->getHash()) + )); } $telegram_apk_lines_str = implode("\n", $telegram_apk_lines); $phorge_apk_lines_str = implode("\n", $phorge_apk_lines); // add a comment to the build URL if (!empty($phorge_document_id) && empty(getenv('NO_COMMENT'))) { // We have a Differentials revision under review! $telegram_chat_content = implode("\n", [ // In Telegram, normal text must be escaped. Link destinations must not be escaped. TelegramStupidSDK::escapeMarkdownV2("⚙ Dear Android hackers, please review this promising patch:"), TelegramStupidSDK::escapeMarkdownV2("https://gitpull.it/$phorge_document_id"), "", TelegramStupidSDK::escapeMarkdownV2("Here the related fresh test builds:"), "", // The texts in these links are already escaped. $telegram_apk_lines_str, ]); // Send message to Telegram groups. echo "DEBUG TELEGRAM CONTENT\n"; echo "$telegram_chat_content\n"; // Send message to your default Telegram group. // See the TELEGRAM_* environment variables. (new TelegramStupidSDK())->sendMessage($telegram_chat_content); - // Send message to Phorge. - echo "Adding bipbop Comment to $phorge_document_id\n"; - shell_exec(sprintf( - "~/bin/phab-comment.php %s %s %s", - escapeshellarg($phorge_document_id), - escapeshellarg($apk_aligned_signed_url), - escapeshellarg($apk_raw_sha256) - )); + } else { // We have NOT a Differentials revision under review! // So this is an atomic commit. $telegram_chat_content = implode("\n", [ "🌚 New commit: *$git_commit_title*", "https://gitpull.it/R4:$git_commit", "", "Here the related fresh test builds:", "", $telegram_apk_lines_str, ]); echo "DEBUG TELEGRAM CONTENT\n"; echo "$telegram_chat_content\n"; // Send message to your default Telegram group. // See the TELEGRAM_* environment variables. (new TelegramStupidSDK())->sendMessage($telegram_chat_content); } // delete very old files print_log_info("Cleaning old artifacts"); shell_exec(sprintf( "find %s -type f -mtime +120 -delete", escapeshellarg($ARTIFACTS_PATH) )); print_log_info("Done"); diff --git a/include/APK.php b/include/APK.php index 0279527..22664bb 100644 --- a/include/APK.php +++ b/include/APK.php @@ -1,93 +1,106 @@ name = $name; $this->url = $url; $this->sha256 = $sha256; $this->ABI = $ABI; } /** * @return array */ public function getPhorgeCommentLines() { return [ $this->getPhorgeDownloadLink(), $this->getPhorgeAPKSignatureLine() ]; } /** * Get the ABI architecture. */ public function getABI(): string { // TODO: calculate this. return $this->ABI; } + /** + * Get the final URL. + */ + public function getURL(): string { + return $this->url; + } + + /** + * Get the sha256 of the APK file. + */ + public function getHash(): string { + return $this->sha256; + } /** * @return array */ public function getTelegramCommentLines() { return [ $this->getTelegramDownloadLink(), $this->getPhorgeAPKSignatureLine() ]; } /** * Get a very generic download link for Phorge. * @return string */ private function getPhorgeDownloadLink(): string { return sprintf( "[%s](%s)", "Download {$this->name}", $this->url ); } /** * Get a very generic download link for Phorge. * @return string */ private function getTelegramDownloadLink(): string { // In Telegram it seems we must escape the link text from special characters. // The link, instead, can be returned as-is. // So the Text from: "Download asd.apk" // to: "Download asd\\.apk" return sprintf( "[%s](%s)", TelegramStupidSDK::escapeMarkdownV2("Download {$this->name}"), $this->url ); } /** * Get a very generic line about the sha256sum of this APK. * @return string */ private function getPhorgeAPKSignatureLine() { // NOTE: if you write a ":" here, Telegram will crash. Sanitize it for Telegram asd. return sprintf( "APK sha256: `%s`", $this->sha256 ); } }