@backifydev/cli 0.3.5 → 0.3.6

package/dist/index.js

@@ -22776,6 +22776,21 @@ function localReport(runChecks, root = process.cwd()) {
 function matchesSource(release, commit) {
   return release?.commitSha === commit || release?.sourceCommitSha === commit;
 }
+function pushSource(appId, commit, branch, destination, root, environment) {
+  const remoteHead = git2(["ls-remote", "--", destination, "refs/heads/" + branch], root, environment).split(/\s+/)[0];
+  if (remoteHead === commit) return true;
+  if (remoteHead) {
+    git2(["fetch", "--no-tags", "--", destination, "refs/heads/" + branch], root, environment);
+    const fetchedHead = git2(["rev-parse", "FETCH_HEAD"], root);
+    if (fetchedHead === commit) return true;
+    const parent = git2(["show", "-s", "--format=%P", fetchedHead], root);
+    const message = git2(["show", "-s", "--format=%B", fetchedHead], root);
+    if (parent === commit && message === "Backify build " + applicationGuid(appId).replaceAll("-", "") + ": " + commit) return true;
+    if (git2(["merge-base", commit, fetchedHead], root) !== fetchedHead) throw new Error("Remote history contains other changes. Run backify pull and reconcile them before shipping; nothing was pushed or overwritten.");
+  }
+  git2(["push", "--", destination, commit + ":refs/heads/" + branch], root, environment);
+  return false;
+}
 async function waitForPreview(call2, prefix, commit, options = {}) {
   const deadline = Date.now() + (options.timeoutMs ?? 20 * 6e4);
   const sleep = options.sleep ?? ((delay) => new Promise((resolve24) => setTimeout(resolve24, delay)));
@@ -22817,10 +22832,10 @@ async function ship(call2, appId, options = {}) {
   if (credential.repository.toLowerCase() !== status.repository.toLowerCase()) throw new Error("Repository changed; reconnect before shipping.");
   const environment = gitEnvironment(status.repository, credential.token);
   const destination = "https://github.com/" + status.repository + ".git";
-  const remoteHead = git2(["ls-remote", "--", destination, "refs/heads/" + status.branch], root, environment).split(/\s+/)[0];
-  git2(["push", "--", destination, commit + ":refs/heads/" + status.branch], root, environment);
-  if (remoteHead === commit && !(matchesSource(status.releases.preview, commit) && status.releases.preview?.status === "succeeded")) await call2(prefix + "/deployments/preview", { method: "POST", body: JSON.stringify({ sourceRevision: "latest" }) });
-  const overview = await waitForPreview(call2, prefix, commit, { timeoutMs: options.timeoutMs, previousDeploymentIds: previousDeployments.map((deployment) => deployment.id), previousBuildRunId: previousBuild.runId ?? null });
+  const alreadyPushed = pushSource(appId, commit, status.branch, destination, root, environment);
+  const currentPreview = previousDeployments.find((release) => release.kind === "preview" && matchesSource(release, commit));
+  if (alreadyPushed && (!currentPreview || currentPreview.status === "failed") && !(matchesSource(status.releases.preview, commit) && status.releases.preview?.status === "succeeded")) await call2(prefix + "/deployments/preview", { method: "POST", body: JSON.stringify({ sourceRevision: "latest" }) });
+  const overview = await waitForPreview(call2, prefix, commit, { timeoutMs: options.timeoutMs, previousDeploymentIds: previousDeployments.filter((deployment) => deployment.status === "failed").map((deployment) => deployment.id), previousBuildRunId: previousBuild.runId ?? null });
   if (overview.preview.commitSha !== commit) {
     if (git2(["status", "--porcelain"], root) || git2(["rev-parse", "HEAD"], root) !== commit) throw new Error("Local work changed while the preview built. Review it before synchronizing the build commit.");
     const refreshed = await call2(prefix + "/developer/git-credential", { method: "POST" });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backifydev/cli",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Command-line setup and diagnostics for Backify applications",
   "type": "module",
   "bin": {