From 799cf01fe27a3a2e49bd6641ea2639d97746f267 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Thu, 21 Sep 2023 16:32:47 -0400 Subject: [PATCH 1/3] fix: remove unnecessary gh workflow run --- script/migrate-test-e2e.js | 1 - src/steps/writing/creation/dotGitHub/workflows.ts | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/script/migrate-test-e2e.js b/script/migrate-test-e2e.js index 4c71397da..cf2bb2bfa 100644 --- a/script/migrate-test-e2e.js +++ b/script/migrate-test-e2e.js @@ -35,7 +35,6 @@ const filesExpectedToBeChanged = new Set([ ".eslintignore", ".eslintrc.cjs", ".github/DEVELOPMENT.md", - ".github/workflows/release.yml", ".github/workflows/lint.yml", ".github/workflows/lint-knip.yml", ".github/workflows/test.yml", diff --git a/src/steps/writing/creation/dotGitHub/workflows.ts b/src/steps/writing/creation/dotGitHub/workflows.ts index b309921d8..1acb27ec9 100644 --- a/src/steps/writing/creation/dotGitHub/workflows.ts +++ b/src/steps/writing/creation/dotGitHub/workflows.ts @@ -214,8 +214,7 @@ export function createWorkflows(options: Options) { }, run: ` if pnpm run should-semantic-release ; then - pnpm release-it --verbose - gh workflow run post-release.yml + pnpm release-it --verbose fi`, }, { From f6b77ef8352a54fc0f4a7c195288c21863f3c33a Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Thu, 21 Sep 2023 16:41:42 -0400 Subject: [PATCH 2/3] Try normalizing formatting --- .../writing/creation/dotGitHub/workflows.ts | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/steps/writing/creation/dotGitHub/workflows.ts b/src/steps/writing/creation/dotGitHub/workflows.ts index 1acb27ec9..93891a4cc 100644 --- a/src/steps/writing/creation/dotGitHub/workflows.ts +++ b/src/steps/writing/creation/dotGitHub/workflows.ts @@ -227,34 +227,34 @@ export function createWorkflows(options: Options) { github.request( \`PUT /repos/${options.owner}/${options.repository}/branches/main/protection\`, { - allow_deletions: false, - allow_force_pushes: true, - allow_fork_pushes: false, - allow_fork_syncing: true, - block_creations: false, - branch: "main", - enforce_admins: false, - owner: "${options.owner}", - repo: "${options.repository}", - required_conversation_resolution: true, - required_linear_history: false, - required_pull_request_reviews: null, - required_status_checks: { + allow_deletions: false, + allow_force_pushes: true, + allow_fork_pushes: false, + allow_fork_syncing: true, + block_creations: false, + branch: "main", + enforce_admins: false, + owner: "${options.owner}", + repo: "${options.repository}", + required_conversation_resolution: true, + required_linear_history: false, + required_pull_request_reviews: null, + required_status_checks: { checks: [ - { context: "build" }, - { context: "compliance" }, - { context: "lint" }, - { context: "lint_knip" }, - { context: "lint_markdown" }, - { context: "lint_package_json" }, - { context: "lint_packages" }, - { context: "lint_spelling" }, - { context: "prettier" }, - { context: "test" }, + { context: "build" }, + { context: "compliance" }, + { context: "lint" }, + { context: "lint_knip" }, + { context: "lint_markdown" }, + { context: "lint_package_json" }, + { context: "lint_packages" }, + { context: "lint_spelling" }, + { context: "prettier" }, + { context: "test" }, ], strict: false, }, - restrictions: null, + restrictions: null, } ); `, From 09f14127d39f4bf7383d46bbdf4bd38550e12440 Mon Sep 17 00:00:00 2001 From: Josh Goldberg Date: Thu, 21 Sep 2023 16:48:49 -0400 Subject: [PATCH 3/3] Let's try some spaces --- .../writing/creation/dotGitHub/workflows.ts | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/steps/writing/creation/dotGitHub/workflows.ts b/src/steps/writing/creation/dotGitHub/workflows.ts index 93891a4cc..4c738cc14 100644 --- a/src/steps/writing/creation/dotGitHub/workflows.ts +++ b/src/steps/writing/creation/dotGitHub/workflows.ts @@ -227,34 +227,34 @@ export function createWorkflows(options: Options) { github.request( \`PUT /repos/${options.owner}/${options.repository}/branches/main/protection\`, { - allow_deletions: false, - allow_force_pushes: true, - allow_fork_pushes: false, - allow_fork_syncing: true, - block_creations: false, - branch: "main", - enforce_admins: false, - owner: "${options.owner}", - repo: "${options.repository}", - required_conversation_resolution: true, - required_linear_history: false, - required_pull_request_reviews: null, - required_status_checks: { - checks: [ - { context: "build" }, - { context: "compliance" }, - { context: "lint" }, - { context: "lint_knip" }, - { context: "lint_markdown" }, - { context: "lint_package_json" }, - { context: "lint_packages" }, - { context: "lint_spelling" }, - { context: "prettier" }, - { context: "test" }, - ], - strict: false, - }, - restrictions: null, + allow_deletions: false, + allow_force_pushes: true, + allow_fork_pushes: false, + allow_fork_syncing: true, + block_creations: false, + branch: "main", + enforce_admins: false, + owner: "${options.owner}", + repo: "${options.repository}", + required_conversation_resolution: true, + required_linear_history: false, + required_pull_request_reviews: null, + required_status_checks: { + checks: [ + { context: "build" }, + { context: "compliance" }, + { context: "lint" }, + { context: "lint_knip" }, + { context: "lint_markdown" }, + { context: "lint_package_json" }, + { context: "lint_packages" }, + { context: "lint_spelling" }, + { context: "prettier" }, + { context: "test" }, + ], + strict: false, + }, + restrictions: null, } ); `,