@dbx-tools/projen 0.6.230 → 0.7.0

package/README.md

@@ -194,6 +194,11 @@ archive content and repository identity, PyPI uses hash-aware existing-file
 behavior, Cargo checks existing versions, and GitHub assets upload to the
 component release.
 
+Set `releaseSyncBranch` when a repository retains a long-lived source branch.
+After publication the workflow fast-forwards that branch only when it exists
+and is an ancestor of released `main`; missing or diverged branches are left
+untouched.
+
 The Rust matrix has one row per target. Each row installs native dependencies,
 builds the Cargo workspace once, then packages every discovered output from
 that shared build. Set a source-only crate's or

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/projen";
-export const PACKAGE_VERSION = "0.6.230";
+export const PACKAGE_VERSION = "0.7.0";
 export * as barrels from "./src/barrels.ts";
 export * as bunApp from "./src/bun-app.ts";
 export * as bunWorkflow from "./src/bun-workflow.ts";

package/package.json

@@ -50,7 +50,7 @@
   },
   "main": "index.ts",
   "license": "Apache-2.0",
-  "version": "0.6.230",
+  "version": "0.7.0",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-js.ts

@@ -634,6 +634,8 @@ export type DBXToolsJavaScriptProjectOptions = CommonProjectOptions &
     readonly releaseValidationTasks?: readonly string[];
     /** Optional AI-generated release summary. Defaults to enabled. */
     readonly releaseSummary?: boolean | ReleaseSummaryOptions;
+    /** Existing source branch safely fast-forwarded after an independent release. */
+    readonly releaseSyncBranch?: string | false;
     /** Set to `false` to omit normal npm workspace publication. */
     readonly nodeRelease?: boolean;
     /** Unified dbx-tools release workflow, or no release surface. Defaults to `dbx-tools`. */
@@ -1601,6 +1603,7 @@ function initProject(
       pythonRoot: options.releasePythonRoot,
       validationTasks: options.releaseValidationTasks,
       summary: options.releaseSummary,
+      syncBranch: options.releaseSyncBranch,
     });
   }
 }

package/src/release.ts

@@ -56,6 +56,12 @@ export interface DBXToolsReleaseOptions {
   readonly pythonRoot?: string;
   /** Repository task names run in the release worktree before expensive validation and publication. */
   readonly validationTasks?: readonly string[];
+  /**
+   * Existing source branch safely fast-forwarded after publication.
+   *
+   * Missing or diverged branches are left untouched.
+   */
+  readonly syncBranch?: string | false;
   /**
    * Generate a versioned release summary locally. Defaults to enabled with the
    * standard Cursor, Codex, Claude fallback order.
@@ -617,6 +623,39 @@ function addIndependentDocsJobs(
   });
 }
 
+function addIndependentBranchSyncJob(workflow: GithubWorkflow, branch: string): void {
+  workflow.addJob("sync-release-branch", {
+    if: "${{ github.event_name == 'push' && needs.publication-complete.result == 'success' }}",
+    needs: ["publication-complete"],
+    runsOn: ["ubuntu-latest"],
+    permissions: { contents: JobPermission.WRITE },
+    steps: [
+      {
+        name: "Checkout released main",
+        uses: "actions/checkout@v6",
+        with: { "fetch-depth": 0 },
+      },
+      {
+        name: `Safely fast-forward ${branch}`,
+        shell: "bash",
+        env: { SOURCE_BRANCH: branch },
+        run: [
+          'if ! git ls-remote --exit-code --heads origin "refs/heads/$SOURCE_BRANCH" >/dev/null 2>&1; then',
+          '  echo "source branch $SOURCE_BRANCH no longer exists; nothing to sync"',
+          "  exit 0",
+          "fi",
+          'git fetch origin "refs/heads/$SOURCE_BRANCH:refs/remotes/origin/$SOURCE_BRANCH"',
+          'if git merge-base --is-ancestor "origin/$SOURCE_BRANCH" HEAD; then',
+          '  git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
+          "else",
+          '  echo "::warning::source branch $SOURCE_BRANCH diverged from released main; leaving it untouched"',
+          "fi",
+        ].join("\n"),
+      },
+    ],
+  });
+}
+
 class IndependentReleaseFinalizer extends Component {
   private finalized = false;
 
@@ -624,6 +663,7 @@ class IndependentReleaseFinalizer extends Component {
     project: DBXToolsJavaScriptProject,
     private readonly workflow: GithubWorkflow,
     private readonly docs: ReleaseDocsOptions | undefined,
+    private readonly syncBranch: string | undefined,
   ) {
     super(project);
   }
@@ -645,6 +685,9 @@ class IndependentReleaseFinalizer extends Component {
     if (this.docs) {
       addIndependentDocsJobs(this.workflow, this.project as DBXToolsJavaScriptProject, this.docs);
     }
+    if (this.syncBranch) {
+      addIndependentBranchSyncJob(this.workflow, this.syncBranch);
+    }
   }
 }
 
@@ -713,7 +756,7 @@ function configureIndependentRelease(
     workflow.addJob("publish-node", independentNodePublishJob(project));
     registerIndependentPublicationJob(workflow, "publish-node");
   }
-  new IndependentReleaseFinalizer(project, workflow, options.docs);
+  new IndependentReleaseFinalizer(project, workflow, options.docs, options.syncBranch || undefined);
   releaseWorkflows.set(project, workflow);
 }