@dbx-tools/projen 0.8.0 → 0.8.1

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.8.0";
+export const PACKAGE_VERSION = "0.8.1";
 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.8.0",
+  "version": "0.8.1",
   "types": "index.ts",
   "type": "module",
   "exports": {

package/src/project-js.ts

@@ -15,7 +15,7 @@ import { type IConstruct } from "constructs";
 import { Component, IgnoreFile, Project, type TaskOptions, javascript, typescript } from "projen";
 import { BuildWorkflow } from "projen/lib/build";
 import { AutoMerge } from "projen/lib/github";
-import { JobPermission, type JobStep } from "projen/lib/github/workflows-model";
+import { JobPermission, type JobStep, type Triggers } from "projen/lib/github/workflows-model";
 import type { ReleaseProjectOptions } from "projen/lib/release";
 import { mixin } from "..";
 import { generateBarrels } from "./barrels.ts";
@@ -943,7 +943,35 @@ function configureBuildWorkflow(
   });
   validation.exec("bunx projen default");
   validation.exec("bun run compile");
-  const configured = options.buildWorkflowOptions ?? {};
+  const configured = {
+    ...options.buildWorkflowOptions,
+    ...(!options.buildWorkflowOptions?.workflowTriggers &&
+    project.releaseCatalog.mode === "independent"
+      ? {
+          workflowTriggers: {
+            pullRequest: {
+              types: ["opened", "synchronize", "reopened", "closed"],
+              paths: [
+                "**",
+                "!.projen/release-units.json",
+                "!.release-please-manifest.json",
+                "!.release-units/**",
+                "!.release-notes/**",
+                "!docs/releases/**",
+                "!Cargo.lock",
+                "!**/Cargo.toml",
+                "!**/package.json",
+                "!**/pyproject.toml",
+                "!**/index.ts",
+                "!packages/js/node/rust-binary/src/_rust-release-binaries.ts",
+                "!packages/js/node/appkit-graphiti/src/_python-runtime.ts",
+              ],
+            },
+            workflowDispatch: {},
+          } satisfies Triggers,
+        }
+      : {}),
+  };
   const compatibility = nodeWorkflowCompatibility(project);
   const configuredRunner = configured.runsOn !== undefined || configured.runsOnGroup !== undefined;
   const workflow = new BuildWorkflow(project, {

package/src/release.ts

@@ -464,7 +464,7 @@ function configureReleaseRequestWorkflow(
     if: `\${{ github.ref_name != '${baseBranch}' }}`,
     runsOn: ["ubuntu-latest"],
     permissions: {
-      contents: JobPermission.READ,
+      contents: JobPermission.WRITE,
       pullRequests: JobPermission.WRITE,
     },
     steps: [
@@ -489,7 +489,7 @@ function configureReleaseRequestWorkflow(
           "  exit 0",
           "fi",
           'echo "requested=true" >> "$GITHUB_OUTPUT"',
-          'echo "branch=$(git branch --show-current)" >> "$GITHUB_OUTPUT"',
+          'echo "branch=$GITHUB_REF_NAME" >> "$GITHUB_OUTPUT"',
           'echo "approve=$(sed -n \'s/^Release-Approve: //p\' <<<"$MESSAGE" | tail -1)" >> "$GITHUB_OUTPUT"',
           'echo "notes_path=$(sed -n \'s/^Release-Notes-Path: //p\' <<<"$MESSAGE" | tail -1)" >> "$GITHUB_OUTPUT"',
           'echo "title=$(git log -1 --skip=1 --format=%s)" >> "$GITHUB_OUTPUT"',
@@ -515,7 +515,8 @@ function configureReleaseRequestWorkflow(
           'if [ -n "$PR" ]; then',
           '  gh pr edit "$PR" --title "$TITLE" --body "$BODY"',
           "else",
-          '  PR="$(gh pr create --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --title "$TITLE" --body "$BODY" --json number --jq .number)"',
+          '  gh pr create --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --title "$TITLE" --body "$BODY"',
+          '  PR="$(gh pr list --head "$SOURCE_BRANCH" --base "$BASE_BRANCH" --state open --json number --jq \'.[0].number\')"',
           "fi",
           'if [ "$APPROVE" = "true" ]; then gh pr merge "$PR" --auto --merge; fi',
         ].join("\n"),
@@ -721,18 +722,27 @@ function addIndependentDocsJobs(
   });
 }
 
-function addIndependentBranchSyncJob(workflow: GithubWorkflow, branch: string): void {
+function addIndependentBranchSyncJob(
+  workflow: GithubWorkflow,
+  project: DBXToolsJavaScriptProject,
+  branch: string,
+): void {
   workflow.addJob("sync-release-branch", {
     if: "${{ always() && github.event_name == 'push' && needs['publication-complete'].result == 'success' }}",
     needs: ["publication-complete"],
     runsOn: ["ubuntu-latest"],
     permissions: { contents: JobPermission.WRITE },
+    env: { BUN_VERSION },
     steps: [
       {
         name: "Checkout released main",
         uses: "actions/checkout@v6",
         with: { "fetch-depth": 0 },
       },
+      ...bunCacheRestoreSteps(project, {
+        ignorePaths: project.workflowCacheIgnorePaths,
+      }),
+      { name: "Install dependencies", run: "bun install" },
       {
         name: `Safely sync ${branch}`,
         shell: "bash",
@@ -754,8 +764,23 @@ function addIndependentBranchSyncJob(workflow: GithubWorkflow, branch: string):
           '  if git merge --no-ff --no-edit "$GITHUB_SHA"; then',
           '    git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
           "  else",
+          '    SAFE_GENERATED="true"',
+          "    while IFS= read -r FILE; do",
+          '      case "$FILE" in',
+          "        .projen/release-units.json|.release-please-manifest.json|.release-units/*/source.json|.release-units/*/version.txt|.release-units/*/CHANGELOG.md|Cargo.lock|*/Cargo.toml|*/package.json|*/pyproject.toml|*/index.ts) ;;",
+          '        *) SAFE_GENERATED="false" ;;',
+          "      esac",
+          "    done < <(git diff --name-only --diff-filter=U)",
+          '    if [ "$SAFE_GENERATED" = "true" ] && bunx projen; then',
+          "      git add -A",
+          '      if [ -z "$(git diff --name-only --diff-filter=U)" ]; then',
+          "        git commit --no-edit",
+          '        git push origin "HEAD:refs/heads/$SOURCE_BRANCH"',
+          "        exit 0",
+          "      fi",
+          "    fi",
           "    git merge --abort",
-          '    echo "::warning::source branch $SOURCE_BRANCH has merge conflicts with released main; leaving it untouched"',
+          '    echo "::warning::source branch $SOURCE_BRANCH has handwritten or unresolved conflicts with released main; leaving it untouched"',
           "  fi",
           "fi",
         ].join("\n"),
@@ -794,7 +819,11 @@ class IndependentReleaseFinalizer extends Component {
       addIndependentDocsJobs(this.workflow, this.project as DBXToolsJavaScriptProject, this.docs);
     }
     if (this.syncBranch) {
-      addIndependentBranchSyncJob(this.workflow, this.syncBranch);
+      addIndependentBranchSyncJob(
+        this.workflow,
+        this.project as DBXToolsJavaScriptProject,
+        this.syncBranch,
+      );
     }
   }
 }