From 6960db200b64f86309ebc4e2391941d11c7ddf11 Mon Sep 17 00:00:00 2001 From: cbl980226 <55084702+cbl980226@users.noreply.github.com> Date: Tue, 7 Mar 2023 22:47:26 +0800 Subject: [PATCH] fix(misc): ci workflow generator use correct default branch (#15487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Miroslav Jonaš --- .../ci-workflow/__snapshots__/ci-workflow.spec.ts.snap | 2 ++ .../github/.github/workflows/__workflowFileName__.yml__tmpl__ | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap b/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap index f2a4c84efae842..0da99f53ff0bc1 100644 --- a/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap +++ b/packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap @@ -175,6 +175,7 @@ jobs: name: Nx Cloud - Main Job uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3 with: + main-branch-name: main number-of-agents: 3 init-commands: | yarn nx-cloud start-ci-run --stop-agents-after=\\"build\\" --agent-count=3 @@ -207,6 +208,7 @@ jobs: name: Nx Cloud - Main Job uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3 with: + main-branch-name: main number-of-agents: 3 init-commands: | yarn nx-cloud start-ci-run --stop-agents-after=\\"build\\" --agent-count=3 diff --git a/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ b/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ index fde44f4971832b..91da27b996e5be 100644 --- a/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +++ b/packages/workspace/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ @@ -11,6 +11,7 @@ jobs: name: Nx Cloud - Main Job uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3 with: + main-branch-name: <%= mainBranch %> number-of-agents: 3 init-commands: | <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3