@smoothbricks/cli 0.10.5 → 0.10.6

package/src/monorepo/publish-workflow.ts

@@ -7,6 +7,7 @@ import {
 } from '@smoothbricks/nx-plugin/workspace-config-policy';
 import type { Options as PrettierOptions } from 'prettier';
 import { isSmoothBricksCodebasePackageName } from '../lib/cli-package.js';
+import { renderRunsOnLine, type WorkflowRunsOn } from './github-runs-on.js';
 
 const PUBLISH_WORKFLOW_FORMAT_OPTIONS = Object.freeze({
   parser: 'yaml',
@@ -55,6 +56,8 @@ export interface PublishWorkflowDefinitionOptions {
   deployProvider?: 'cloudflare';
   repoName?: string;
   platformTargetGlobs?: readonly string[];
+  /** Linux jobs only. Default ubuntu-latest. Same smoo.github.runsOn as CI. */
+  runsOn?: WorkflowRunsOn;
 }
 
 export interface PublishWorkflowInputs {
@@ -441,7 +444,8 @@ function yamlLinesForStep(step: PublishWorkflowStep, options: PublishWorkflowDef
     case PublishWorkflowStepKind.UploadTraceDbs:
       return [
         `      - name: ${step.name}`,
-        `        if: ${githubExpression('failure()')}`,
+        '        # Default is success(); failure() uploads traces only when the job already failed.',
+        '        if: failure()',
         '        uses: actions/upload-artifact@v7.0.1',
         '        with:',
         `          name: trace-results-${githubExpression('github.run_id')}`,
@@ -465,7 +469,8 @@ function yamlLinesForStep(step: PublishWorkflowStep, options: PublishWorkflowDef
     case PublishWorkflowStepKind.SaveNixDevenv:
       return [
         `      - name: ${step.name}`,
-        `        if: ${githubExpression('always()')}`,
+        '        # success() is default; always() still saves GH Nix cache after a red job.',
+        '        if: always()',
         '        uses: ./.github/actions/save-nix-devenv',
         '        with:',
         `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`,
@@ -498,7 +503,7 @@ function deployEnvLines(options: PublishWorkflowDefinitionOptions): string[] {
 
 function conditionalRunStep(step: PublishWorkflowStep, run: string): string[] {
   const condition = "steps.version.outputs.mode != 'none'";
-  return [`      - name: ${step.name}`, `        if: ${githubExpression(condition)}`, `        run: ${run}`];
+  return [`      - name: ${step.name}`, `        if: ${condition}`, `        run: ${run}`];
 }
 
 function renderSingleJobPublishWorkflowSteps(
@@ -514,7 +519,7 @@ function renderSingleJobPublishWorkflowSteps(
     if (step.kind === PublishWorkflowStepKind.Build) {
       lines.push(
         '      - name: 🐧 Build supplemental Linux targets',
-        `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
+        "        if: steps.version.outputs.mode != 'none'",
         `        run: smoo github-ci nx-run-many --targets "${LINUX_PLATFORM_TARGET_GLOBS.join(',')}" --projects "${githubExpression(
           'steps.version.outputs.projects',
         )}"`,
@@ -566,7 +571,7 @@ defaults:
 
 jobs:
   linux-release-candidate:
-    runs-on: ubuntu-latest
+${renderRunsOnLine(options.runsOn)}
     permissions:
       contents: write
       id-token: none
@@ -642,7 +647,7 @@ function renderLinuxReleaseCandidateSteps(
     } else if (step.kind === PublishWorkflowStepKind.Build) {
       lines.push(
         `      - name: ${step.name}`,
-        `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
+        "        if: steps.version.outputs.mode != 'none'",
         '        run:',
         `          smoo github-ci nx-run-many --targets build --projects "${githubExpression(
           'steps.version.outputs.projects',
@@ -667,7 +672,7 @@ function renderLinuxReleaseCandidateSteps(
         '',
         `      # Step ${stepNumber}`,
         '      - name: 🐧 Build supplemental Linux targets',
-        `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
+        "        if: steps.version.outputs.mode != 'none'",
         '        run:',
         `          smoo github-ci nx-run-many --targets "${LINUX_PLATFORM_TARGET_GLOBS.join(
           ',',
@@ -700,7 +705,7 @@ function renderLinuxReleaseCandidateSteps(
     '',
     `      # Step ${stepNumber++}`,
     '      - name: 📤 Upload validated build outputs',
-    `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
+    "        if: steps.version.outputs.mode != 'none'",
     '        uses: actions/upload-artifact@v7.0.1',
     '        with:',
     `          name: publish-release-outputs-${githubExpression('github.run_id')}`,
@@ -714,7 +719,7 @@ function renderLinuxReleaseCandidateSteps(
       '',
       `      # Step ${stepNumber++}`,
       '      - name: 📤 Upload supplemental Linux outputs',
-      `        if: ${githubExpression("steps.version.outputs.mode != 'none'")}`,
+      "        if: steps.version.outputs.mode != 'none'",
       '        uses: actions/upload-artifact@v7.0.1',
       '        with:',
       `          name: publish-linux-outputs-${githubExpression('github.run_id')}`,
@@ -730,7 +735,8 @@ function renderLinuxReleaseCandidateSteps(
     '',
     `      # Step ${stepNumber}`,
     '      - name: 🧹 Cleanup and cache Nix/devenv',
-    `        if: ${githubExpression('always()')}`,
+    '        # success() is default; always() still saves GH Nix cache after a red job.',
+    '        if: always()',
     '        uses: ./.github/actions/save-nix-devenv',
     '        with:',
     `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`,
@@ -792,7 +798,8 @@ function renderMacosPlatformSteps(options: PublishWorkflowDefinitionOptions): st
     '',
     `      # Step ${stepNumber}`,
     '      - name: 🧹 Cleanup and cache Nix/devenv',
-    `        if: ${githubExpression('always()')}`,
+    '        # success() is default; always() still saves GH Nix cache after a red job.',
+    '        if: always()',
     '        uses: ./.github/actions/save-nix-devenv',
     '        with:',
     `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`,
@@ -876,7 +883,7 @@ function renderFinalLinuxPublishSteps(options: PublishWorkflowDefinitionOptions)
     '',
     `      # Step ${stepNumber++}`,
     '      - name: 📦 Apply verified Linux outputs',
-    `        if: ${githubExpression(`${mode} != 'none'`)}`,
+    `        if: ${mode} != 'none'`,
     '        run:',
     `          smoo github-ci apply-outputs --source-sha "${githubExpression(
       'needs.linux-release-candidate.outputs.release-sha',
@@ -896,7 +903,7 @@ function renderFinalLinuxPublishSteps(options: PublishWorkflowDefinitionOptions)
     '',
     `      # Step ${stepNumber++}`,
     '      - name: 🍎 Apply verified macOS outputs',
-    `        if: ${githubExpression(`${mode} != 'none'`)}`,
+    `        if: ${mode} != 'none'`,
     '        run:',
     `          smoo github-ci apply-outputs --source-sha "${githubExpression('github.sha')}"`,
     `          "${githubExpression('runner.temp')}/publish-artifacts/publish-macos-outputs-${githubExpression(
@@ -905,7 +912,7 @@ function renderFinalLinuxPublishSteps(options: PublishWorkflowDefinitionOptions)
     '',
     `      # Step ${stepNumber++}`,
     `      - name: ✅ Validate restored release (${githubExpression(mode)})`,
-    `        if: ${githubExpression(`${mode} != 'none'`)}`,
+    `        if: ${mode} != 'none'`,
     '        run: smoo monorepo validate',
     '',
     '      # --- Release ------------------------------------------------------------',
@@ -937,7 +944,8 @@ function renderFinalLinuxPublishSteps(options: PublishWorkflowDefinitionOptions)
     '',
     `      # Step ${stepNumber}`,
     '      - name: 🧹 Cleanup and cache Nix/devenv',
-    `        if: ${githubExpression('always()')}`,
+    '        # success() is default; always() still saves GH Nix cache after a red job.',
+    '        if: always()',
     '        uses: ./.github/actions/save-nix-devenv',
     '        with:',
     `          nix-cache-hit: ${githubExpression('steps.setup.outputs.nix-cache-hit')}`,