diff --git a/.github/changelog.config.js b/.github/changelog.config.js deleted file mode 100644 index 089394b..0000000 --- a/.github/changelog.config.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; -const config = require("conventional-changelog-conventionalcommits"); - -module.exports = config({ - types: [ - { type: "feat", section: ":rocket: New Features" }, - { type: "perf", section: ":racing_car: Performance" }, - { type: "fix", section: ":fire_extinguisher: Bugs" }, - { type: "chore", section: ":broom: Chore" }, - ], -}); diff --git a/.github/workflows/create-pre-release.yml b/.github/workflows/create-pre-release.yml new file mode 100644 index 0000000..bdb27d7 --- /dev/null +++ b/.github/workflows/create-pre-release.yml @@ -0,0 +1,14 @@ +name: Create Pre-Release + +on: + pull_request: + branches: + - main + types: [closed] + +jobs: + create-pre-release: + name: Create Pre-Release + uses: dot-base/.github/.github/workflows/create-pre-release.yml@main + secrets: + CR_PAT: ${{ secrets.CR_PAT }} diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index bd10db2..b31caeb 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: create-release-pr: name: Create Release PR - uses: dot-base/.github/.github/workflows/create-release-pr.yml@master + uses: dot-base/.github/.github/workflows/create-release-pr.yml@main secrets: GH_BOT_USER: ${{ secrets.GH_BOT_USER }} GH_BOT_PAT: ${{ secrets.GH_BOT_PAT }} diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml new file mode 100644 index 0000000..7c05493 --- /dev/null +++ b/.github/workflows/generate-changelog.yml @@ -0,0 +1,38 @@ +name: Generate Changelog + +on: workflow_dispatch + +jobs: + generate-changelog: + name: Generate Changelog + runs-on: ubuntu-latest + steps: + - name: Check Out Repository + uses: actions/checkout@v3 + with: + ref: "main" + + - name: Check Out .github Repository + uses: actions/checkout@v3 + with: + repository: "dot-base/.github" + ref: "main" + path: "actions-repo" + token: ${{ secrets.GH_BOT_PAT }} + + - name: Install conventional-changelog + run: | + npm i conventional-changelog-conventionalcommits + + - name: Generate Changelog + id: changelog + uses: TriPSs/conventional-changelog-action@v3 + with: + github-token: ${{ secrets.github_token }} + release-count: 0 + output-file: "false" + skip-version-file: "true" + skip-commit: "true" + git-push: "false" + config-file-path: "actions-repo/.github/changelog.config.js" + create-summary: true diff --git a/.github/workflows/manage-pr.yml b/.github/workflows/manage-pr.yml index d0e5521..e063ae3 100644 --- a/.github/workflows/manage-pr.yml +++ b/.github/workflows/manage-pr.yml @@ -3,8 +3,8 @@ name: Manage PR on: pull_request: branches: - - master - - dev + - main + - release pull_request_review: types: - submitted @@ -13,12 +13,12 @@ on: jobs: lint-and-test: name: Lint Files and Run Tests - uses: dot-base/.github/.github/workflows/lint-and-test.yml@master + uses: dot-base/.github/.github/workflows/lint-and-test.yml@main get-pr: name: Get PR needs: lint-and-test - uses: dot-base/.github/.github/workflows/get-pr.yml@master + uses: dot-base/.github/.github/workflows/get-pr.yml@main secrets: GH_BOT_USER: ${{ secrets.GH_BOT_USER }} GH_BOT_PAT: ${{ secrets.GH_BOT_PAT }} @@ -26,7 +26,7 @@ jobs: lint-pr-title: name: Lint PR Title needs: get-pr - uses: dot-base/.github/.github/workflows/lint-pr-title.yml@master + uses: dot-base/.github/.github/workflows/lint-pr-title.yml@main with: pr: ${{ needs.get-pr.outputs.pr }} secrets: @@ -38,7 +38,7 @@ jobs: name: Merge Release PR needs: [get-pr, lint-pr-title] if: ${{ fromJson(needs.get-pr.outputs.pr).type == 'release' && fromJson(needs.get-pr.outputs.pr).isMergeable == true }} - uses: dot-base/.github/.github/workflows/merge-release-pr.yml@master + uses: dot-base/.github/.github/workflows/merge-release-pr.yml@main with: pr: ${{ needs.get-pr.outputs.pr }} secrets: @@ -48,7 +48,7 @@ jobs: create-release: name: Create Release needs: merge-release-pr - uses: dot-base/.github/.github/workflows/create-release.yml@master + uses: dot-base/.github/.github/workflows/create-release.yml@main secrets: GH_BOT_USER: ${{ secrets.GH_BOT_USER }} GH_BOT_PAT: ${{ secrets.GH_BOT_PAT }} @@ -59,27 +59,9 @@ jobs: name: Configure Feature PR needs: [get-pr, lint-pr-title] if: ${{ fromJson(needs.get-pr.outputs.pr).type == 'feature' }} - uses: dot-base/.github/.github/workflows/configure-feature-pr.yml@master + uses: dot-base/.github/.github/workflows/configure-feature-pr.yml@main with: pr: ${{ needs.get-pr.outputs.pr }} secrets: GH_BOT_USER: ${{ secrets.GH_BOT_USER }} GH_BOT_PAT: ${{ secrets.GH_BOT_PAT }} - - merge-feature-pr: - name: Merge Feature PR - needs: [get-pr, lint-pr-title] - if: ${{ fromJson(needs.get-pr.outputs.pr).type == 'feature' && fromJson(needs.get-pr.outputs.pr).isMergeable == true }} - uses: dot-base/.github/.github/workflows/merge-feature-pr.yml@master - with: - pr: ${{ needs.get-pr.outputs.pr }} - secrets: - GH_BOT_USER: ${{ secrets.GH_BOT_USER }} - GH_BOT_PAT: ${{ secrets.GH_BOT_PAT }} - - create-pre-release: - name: Create Pre-Release - needs: merge-feature-pr - uses: dot-base/.github/.github/workflows/create-pre-release.yml@master - secrets: - CR_PAT: ${{ secrets.CR_PAT }} diff --git a/src/controller/icd10.ts b/src/controller/icd10.ts index b0f44a3..00ea70a 100644 --- a/src/controller/icd10.ts +++ b/src/controller/icd10.ts @@ -62,7 +62,10 @@ export class ICD10Controller { private static removeExtensions( res: Fuse.FuseResult[] ): Fuse.FuseResult[] { - res.forEach((r) => (r.item.extension = r.item.modifierExtension = undefined)); + res.forEach((r) => { + r.item.extension = undefined; + r.item.modifierExtension = undefined; + }); return res; } }