diff --git a/.github/workflows/add-new-item-to-project.yml b/.github/workflows/add-new-item-to-project.yml index a5b80d10..d066c156 100644 --- a/.github/workflows/add-new-item-to-project.yml +++ b/.github/workflows/add-new-item-to-project.yml @@ -36,7 +36,7 @@ jobs: add_new_item_to_project: name: Add New Issue needs: item_number - uses: KinsonDigital/Infrastructure/.github/workflows/add-item-to-project.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/add-item-to-project.yml@v13.6.2 with: org-name: "${{ vars.ORGANIZATION_NAME }}" org-project-name: "${{ vars.ORG_PROJECT_NAME }}" diff --git a/.github/workflows/build-csharp-project.yml b/.github/workflows/build-csharp-project.yml index 7e86a1ba..f99f0964 100644 --- a/.github/workflows/build-csharp-project.yml +++ b/.github/workflows/build-csharp-project.yml @@ -90,7 +90,7 @@ jobs: resolve_proj_file_path: name: Resolving ${{ inputs.project-name }} Project File Path needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/resolve-csharp-proj-file.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/resolve-csharp-proj-file.yml@v13.6.2 with: project-name: ${{ inputs.project-name }} base-path: ${{ inputs.base-path }} diff --git a/.github/workflows/dotnet-action-release.yml b/.github/workflows/dotnet-action-release.yml index eb3461fb..93d3d57e 100644 --- a/.github/workflows/dotnet-action-release.yml +++ b/.github/workflows/dotnet-action-release.yml @@ -157,7 +157,7 @@ jobs: validate_version: name: Validate Version needs: [print_validate_workflow, validate_branch] - uses: KinsonDigital/Infrastructure/.github/workflows/validate-csharp-version.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-csharp-version.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" release-type: "${{ inputs.release-type }}" @@ -168,7 +168,7 @@ jobs: validate_tag: name: Validate Tag needs: validate_version - uses: KinsonDigital/Infrastructure/.github/workflows/validate-tag.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-tag.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" release-type: "${{ inputs.release-type }}" @@ -180,7 +180,7 @@ jobs: validate_sdk_setup: name: Validate SDK Setup needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/validate-sdk-setup.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-sdk-setup.yml@v13.6.2 with: repo-name: "${{ inputs.project-name }}" secrets: @@ -216,7 +216,7 @@ jobs: validate_github_release: name: GitHub Release Does Not Exist needs: validate_version - uses: KinsonDigital/Infrastructure/.github/workflows/validate-github-release.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-github-release.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" version: "${{ needs.validate_version.outputs.version }}" @@ -227,7 +227,7 @@ jobs: build_project: name: Build Main Project (${{ inputs.project-name }}) needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" runs-on: "${{ inputs.runs-on }}" @@ -240,7 +240,7 @@ jobs: run_tests: name: Run Tests needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}Tests" runs-on: "${{ inputs.runs-on }}" diff --git a/.github/workflows/dotnet-lib-release.yml b/.github/workflows/dotnet-lib-release.yml index 8b6de17c..9a0d0a15 100644 --- a/.github/workflows/dotnet-lib-release.yml +++ b/.github/workflows/dotnet-lib-release.yml @@ -182,7 +182,7 @@ jobs: validate_version: name: Validate Version - uses: KinsonDigital/Infrastructure/.github/workflows/validate-csharp-version.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-csharp-version.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" release-type: "${{ inputs.release-type }}" @@ -193,7 +193,7 @@ jobs: validate_tag: name: Validate Tag needs: validate_version - uses: KinsonDigital/Infrastructure/.github/workflows/validate-tag.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-tag.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" release-type: "${{ inputs.release-type }}" @@ -205,7 +205,7 @@ jobs: validate_sdk_setup: name: Validate SDK Setup needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/validate-sdk-setup.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-sdk-setup.yml@v13.6.2 with: repo-name: "${{ inputs.project-name }}" secrets: @@ -215,7 +215,7 @@ jobs: nuget_pkg_does_not_exist: name: Validate NuGet Package Does Not Exist needs: validate_version - uses: KinsonDigital/Infrastructure/.github/workflows/nuget-package-does-not-exist.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/nuget-package-does-not-exist.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" version: "${{ needs.validate_version.outputs.version }}" @@ -224,7 +224,7 @@ jobs: validate_milestone_status: name: Validate Milestone Status needs: validate_version - uses: KinsonDigital/Infrastructure/.github/workflows/validate-milestone-status.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-milestone-status.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" version: "${{ needs.validate_version.outputs.version }}" @@ -235,7 +235,7 @@ jobs: validate_github_release: name: GitHub Release Does Not Exist needs: [validate_version] - uses: KinsonDigital/Infrastructure/.github/workflows/validate-github-release.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/validate-github-release.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" version: "${{ needs.validate_version.outputs.version }}" @@ -246,7 +246,7 @@ jobs: build_project: name: Build Main Project needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/build-csharp-project.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}" runs-on: "${{ inputs.runs-on }}" @@ -259,7 +259,7 @@ jobs: run_tests: name: Run Tests needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/run-csharp-tests.yml@v13.6.2 with: project-name: "${{ inputs.project-name }}Tests" runs-on: "${{ inputs.runs-on }}" diff --git a/.github/workflows/internal-prepare-release.yml b/.github/workflows/internal-prepare-release.yml index 90913c92..f65bfbb8 100644 --- a/.github/workflows/internal-prepare-release.yml +++ b/.github/workflows/internal-prepare-release.yml @@ -73,7 +73,7 @@ jobs: prepare_release: name: Prepare ${{ inputs.release-type }} Release Of ${{ vars.PROJECT_NAME }} needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/prepare-release.yml@v13.6.2 with: project-name: "${{ vars.PROJECT_NAME }}" release-type: "${{ inputs.release-type }}" diff --git a/.github/workflows/run-csharp-tests.yml b/.github/workflows/run-csharp-tests.yml index b8ccfedd..43e85afb 100644 --- a/.github/workflows/run-csharp-tests.yml +++ b/.github/workflows/run-csharp-tests.yml @@ -92,7 +92,7 @@ jobs: resolve_proj_file_path: name: Resolving ${{ inputs.project-name }} Project File Path needs: print_validate_workflow - uses: KinsonDigital/Infrastructure/.github/workflows/resolve-csharp-proj-file.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/resolve-csharp-proj-file.yml@v13.6.2 with: project-name: ${{ inputs.project-name }} base-path: ${{ inputs.base-path }} diff --git a/.github/workflows/sync-pr-to-issue.yml b/.github/workflows/sync-pr-to-issue.yml index 261914da..0e395498 100644 --- a/.github/workflows/sync-pr-to-issue.yml +++ b/.github/workflows/sync-pr-to-issue.yml @@ -20,7 +20,7 @@ jobs: github.event_name == 'pull_request_target' && !startsWith(github.head_ref, 'renovate/') && github.head_ref != 'prev-release' && github.head_ref != 'prod-release' - uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.2 with: issue-or-pr-number: ${{ github.event.pull_request.number }} sync-type: initial @@ -37,7 +37,7 @@ jobs: github.head_ref != 'prev-release' && github.head_ref != 'prod-release' && github.event.issue.pull_request && github.event.issue.pull_request.url != null && contains(github.event.comment.body, '[run-sync]') - uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.1 + uses: KinsonDigital/Infrastructure/.github/workflows/initial-manual-sync.yml@v13.6.2 with: issue-or-pr-number: ${{ github.event.issue.number }} sync-type: manual diff --git a/.vscode/launch.json b/.vscode/launch.json index 11d1098f..ec080433 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -141,7 +141,15 @@ "--inspect-wait", "--allow-all" ], - "args": ["Infrastructure", "24", "master", "master"], + "args": [ + "KinsonDigital", + "Infrastructure", + "24", + "master", + "master", + "🚀Preview Release", + "${env:CICD_TOKEN}", + ], "attachSimplePort": 9229, "console": "integratedTerminal", "windows": { @@ -176,6 +184,31 @@ "linux": { "runtimeExecutable": "${userHome}/.deno/bin/deno" } + }, + { // MILESTONE ITEMS ALL CLOSED + "name": "Milestone Items All Closed", + "request": "launch", + "type": "node", + "program": "${workspaceFolder}/cicd/scripts/milestone-items-all-closed.ts", + "cwd": "${workspaceFolder}/cicd", + "runtimeArgs": [ + "run", + "--inspect-wait", + "--allow-all" + ], + "args": [ + "KinsonDigital", + "Infrastructure", + "v13.6.1", + "${env:CICD_TOKEN}", + ], + "attachSimplePort": 9229, + "windows": { + "runtimeExecutable": "${userHome}\\.deno\\bin\\deno.exe" + }, + "linux": { + "runtimeExecutable": "${userHome}/.deno/bin/deno" + } }, { // NUGET PACKAGE EXISTS "name": "NuGet Package Exists", diff --git a/ReleaseNotes/ProductionReleases/Release-Notes-v13.6.2.md b/ReleaseNotes/ProductionReleases/Release-Notes-v13.6.2.md new file mode 100644 index 00000000..09dece40 --- /dev/null +++ b/ReleaseNotes/ProductionReleases/Release-Notes-v13.6.2.md @@ -0,0 +1,9 @@ +

+Infrastructure Production Release Notes - v13.6.2 +

+ + + +

Bug Fixes 🐛

+ +1. [#210](https://github.com/KinsonDigital/Infrastructure/issues/210) - Fixed bugs with processing arguments in the `milestone-exists.ts` and `github-release-does-not-exist.ts` scripts. diff --git a/cicd/core/Services/GenerateReleaseNotesService.ts b/cicd/core/Services/GenerateReleaseNotesService.ts index 8821a769..cb445a94 100644 --- a/cicd/core/Services/GenerateReleaseNotesService.ts +++ b/cicd/core/Services/GenerateReleaseNotesService.ts @@ -47,7 +47,7 @@ export class GenerateReleaseNotesService { const otherChangesHeader = this.htmlService.createHeader("Other 🪧", 2, this.noColor, true, true); let releaseNotes = title; - releaseNotes += Utils.isNothing(quickReminder) ? "" : `\n\n${quickReminder}`; + releaseNotes += Utils.isNothing(quickReminder) ? "" : `\n${quickReminder}`; releaseNotes += `\n\n${newFeaturesHeader}`; releaseNotes += `\n\n${bugFixHeader}`; releaseNotes += `\n\n${breakingChangeHeader}`; diff --git a/cicd/scripts/close-milestone.ts b/cicd/scripts/close-milestone.ts index fe452c73..b18f9ac1 100644 --- a/cicd/scripts/close-milestone.ts +++ b/cicd/scripts/close-milestone.ts @@ -3,7 +3,7 @@ import { MilestoneModel } from "../../deps.ts"; import { Utils } from "../core/Utils.ts"; const closeMilestoneExecutor = async () => { - if (Deno.args.length != 3) { + if (Deno.args.length != 4) { let errorMsg = `The cicd script must have 4 arguments but has ${Deno.args.length} argument(s).`; errorMsg += "\nThe 1st arg is required and must be the GitHub name of the owner of the repository."; errorMsg += "\nThe 2st arg is required and must be the GitHub repo name."; diff --git a/cicd/scripts/milestone-items-all-closed.ts b/cicd/scripts/milestone-items-all-closed.ts index 19e17e1a..c403e291 100644 --- a/cicd/scripts/milestone-items-all-closed.ts +++ b/cicd/scripts/milestone-items-all-closed.ts @@ -3,7 +3,7 @@ import { IssueModel, PullRequestModel } from "../../deps.ts"; import { Utils } from "../core/Utils.ts"; const milestoneItemsAllClosedExecutor = async () => { - if (Deno.args.length != 3) { + if (Deno.args.length != 4) { let errorMsg = `The cicd script must have at 4 arguments but has ${Deno.args.length} argument(s).`; errorMsg += "\nThe 1st arg is required and must be the GitHub repository owner name."; errorMsg += "\nThe 2nd arg is required and must be the GitHub repo name."; @@ -18,13 +18,14 @@ const milestoneItemsAllClosedExecutor = async () => { const ownerName = Deno.args[0].trim(); const repoName = Deno.args[1].trim(); const milestoneTitle = Deno.args[2].trim(); - const token = Deno.args.length >= 4 ? Deno.args[3].trim() : ""; + const token = Deno.args[3].trim(); // Print out all of the arguments Utils.printInGroup("Script Arguments", [ + `Owner Name (Required): ${ownerName}`, `Repo Name (Required): ${repoName}`, `Milestone Title (Required): ${milestoneTitle}`, - `GitHub Token (Required): ${Utils.isNothing(token) ? "Not Provided" : "****"}`, + `GitHub Token (Required): ****`, ]); const repoClient: RepoClient = new RepoClient(ownerName, repoName, token); diff --git a/cicd/scripts/validate-tag.ts b/cicd/scripts/validate-tag.ts index e9b80536..0f4d3ce5 100644 --- a/cicd/scripts/validate-tag.ts +++ b/cicd/scripts/validate-tag.ts @@ -19,8 +19,8 @@ const validateTagExecutor = async () => { const repoName: string = Deno.args[1]; const tagType: string = Deno.args[2].toLowerCase(); let tag: string = Deno.args[3].trim(); - tag = tag.startsWith("v") ? tag : `v${Deno.args[3]}`; - const token = Deno.args.length >= 5 ? Deno.args[4].trim() : ""; + tag = tag.startsWith("v") ? tag : `v${tag}`; + const token = Deno.args[4].trim(); // Print out all of the arguments Utils.printInGroup("Script Arguments", [ @@ -28,7 +28,7 @@ const validateTagExecutor = async () => { `Repo Name (Required): ${repoName}`, `Tag Type (Required): ${tagType}`, `Tag (Required): ${tag}`, - `GitHub Token (Required): ${Utils.isNothing(token) ? "Not Provided" : "****"}`, + `GitHub Token (Required): ****`, ]); const versionTypeInvalid = tagType != "production" && tagType != "preview" && tagType != "either"; diff --git a/deno.json b/deno.json index abb10219..02179988 100644 --- a/deno.json +++ b/deno.json @@ -1,5 +1,5 @@ { - "version": "v13.6.1", + "version": "v13.6.2", "tasks": { "clear": "deno run -A ./.github/internal-cicd/deno-tasks/clear-screen.ts", "build": "deno task clear && deno run -A ./.github/internal-cicd/scripts/deno-check.ts",