From 166cfefed935d65feb84115430ff89f5bd56334a Mon Sep 17 00:00:00 2001 From: ClickUp CI/CD <93961939+cu-infra-svc-git@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:08:03 -0700 Subject: [PATCH] fix(deps): upgrade projen (#296) Co-authored-by: github-actions --- .github/workflows/build.yml | 3 +- .github/workflows/pull-request-lint.yml | 2 + .github/workflows/release.yml | 3 + .mergify.yml | 10 +- .projen/tasks.json | 2 +- API.md | 144 +++++++++++++----- package.json | 6 +- pnpm-lock.yaml | 25 +-- test/__snapshots__/clickup-cdk.test.ts.snap | 24 +++ test/__snapshots__/clickup-ts.test.ts.snap | 13 +- .../datadog-service-catalog.test.ts.snap | 10 +- test/__snapshots__/datadog.test.ts.snap | 15 +- test/__snapshots__/slack-alert.test.ts.snap | 10 +- 13 files changed, 194 insertions(+), 73 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 731b0325..4e6f0f5d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,8 @@ jobs: package-js: needs: build runs-on: ubuntu-latest - permissions: {} + permissions: + contents: read if: ${{ !needs.build.outputs.self_mutation_happened }} steps: - uses: actions/setup-node@v4 diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml index c40e66c3..b6e5ca29 100644 --- a/.github/workflows/pull-request-lint.yml +++ b/.github/workflows/pull-request-lint.yml @@ -10,12 +10,14 @@ on: - reopened - ready_for_review - edited + merge_group: {} jobs: validate: name: Validate PR title runs-on: ubuntu-latest permissions: pull-requests: write + if: (github.event_name == 'pull_request' || github.event_name == 'pull_request_target') steps: - uses: amannn/action-semantic-pull-request@v5.4.0 env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2aeff70d..408fa53f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest diff --git a/.mergify.yml b/.mergify.yml index 154b39fa..e8c3ed2e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,17 +8,17 @@ queue_rules: - -label~=(do-not-merge) - status-success=build - status-success=package-js + merge_method: squash + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} pull_request_rules: - name: Automatic merge on approval and successful build actions: delete_head_branch: {} queue: - method: squash name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) diff --git a/.projen/tasks.json b/.projen/tasks.json index b278b841..cf5ffa29 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -271,7 +271,7 @@ }, "steps": [ { - "exec": "pnpm dlx npm-check-updates@16 --upgrade --target=latest --peer --dep=dev,peer,prod,optional --filter=projen,@time-loop/clickup-projen" + "exec": "pnpm dlx npm-check-updates@16 --upgrade --target=latest --peer --no-deprecated --dep=dev,peer,prod,optional --filter=projen,@time-loop/clickup-projen" }, { "exec": "pnpm i --no-frozen-lockfile" diff --git a/API.md b/API.md index 05da8aae..4b3ca064 100644 --- a/API.md +++ b/API.md @@ -747,8 +747,8 @@ When given a project, this it the project itself. | buildWorkflow | projen.build.BuildWorkflow | The PR build GitHub workflow. | | buildWorkflowJobId | string | The job ID of the build workflow. | | jest | projen.javascript.Jest | The Jest configuration (if enabled). | -| maxNodeVersion | string | Maximum node version required by this package. | -| minNodeVersion | string | Minimum node.js version required by this package. | +| maxNodeVersion | string | Maximum node version supported by this package. | +| minNodeVersion | string | The minimum node version required by this package to function. | | npmignore | projen.IgnoreFile | The .npmignore file. | | prettier | projen.javascript.Prettier | *No description.* | | publisher | projen.release.Publisher | Package publisher. | @@ -1328,7 +1328,9 @@ public readonly maxNodeVersion: string; - *Type:* string -Maximum node version required by this package. +Maximum node version supported by this package. + +The value indicates the package is incompatible with newer versions. --- @@ -1340,7 +1342,9 @@ public readonly minNodeVersion: string; - *Type:* string -Minimum node.js version required by this package. +The minimum node version required by this package to function. + +This value indicates the package is incompatible with older versions. --- @@ -2323,8 +2327,8 @@ When given a project, this it the project itself. | buildWorkflow | projen.build.BuildWorkflow | The PR build GitHub workflow. | | buildWorkflowJobId | string | The job ID of the build workflow. | | jest | projen.javascript.Jest | The Jest configuration (if enabled). | -| maxNodeVersion | string | Maximum node version required by this package. | -| minNodeVersion | string | Minimum node.js version required by this package. | +| maxNodeVersion | string | Maximum node version supported by this package. | +| minNodeVersion | string | The minimum node version required by this package to function. | | npmignore | projen.IgnoreFile | The .npmignore file. | | prettier | projen.javascript.Prettier | *No description.* | | publisher | projen.release.Publisher | Package publisher. | @@ -2907,7 +2911,9 @@ public readonly maxNodeVersion: string; - *Type:* string -Maximum node version required by this package. +Maximum node version supported by this package. + +The value indicates the package is incompatible with newer versions. --- @@ -2919,7 +2925,9 @@ public readonly minNodeVersion: string; - *Type:* string -Minimum node.js version required by this package. +The minimum node version required by this package to function. + +This value indicates the package is incompatible with older versions. --- @@ -3922,8 +3930,8 @@ When given a project, this it the project itself. | buildWorkflow | projen.build.BuildWorkflow | The PR build GitHub workflow. | | buildWorkflowJobId | string | The job ID of the build workflow. | | jest | projen.javascript.Jest | The Jest configuration (if enabled). | -| maxNodeVersion | string | Maximum node version required by this package. | -| minNodeVersion | string | Minimum node.js version required by this package. | +| maxNodeVersion | string | Maximum node version supported by this package. | +| minNodeVersion | string | The minimum node version required by this package to function. | | npmignore | projen.IgnoreFile | The .npmignore file. | | prettier | projen.javascript.Prettier | *No description.* | | publisher | projen.release.Publisher | Package publisher. | @@ -4499,7 +4507,9 @@ public readonly maxNodeVersion: string; - *Type:* string -Maximum node version required by this package. +Maximum node version supported by this package. + +The value indicates the package is incompatible with newer versions. --- @@ -4511,7 +4521,9 @@ public readonly minNodeVersion: string; - *Type:* string -Minimum node.js version required by this package. +The minimum node version required by this package to function. + +This value indicates the package is incompatible with older versions. --- @@ -5004,8 +5016,8 @@ const clickUpCdkConstructLibraryOptions: clickupCdk.ClickUpCdkConstructLibraryOp | keywords | string[] | Keywords to include in `package.json`. | | license | string | License's SPDX identifier. | | licensed | boolean | Indicates if a license should be added. | -| maxNodeVersion | string | Minimum node.js version to require via `engines` (inclusive). | -| minNodeVersion | string | Minimum Node.js version to require via package.json `engines` (inclusive). | +| maxNodeVersion | string | The maximum node version supported by this package. Most projects should not use this option. | +| minNodeVersion | string | The minimum node version required by this package to function. Most projects should not use this option. | | npmAccess | projen.javascript.NpmAccess | Access level of the npm package. | | npmProvenance | boolean | Should provenance statements be generated when the package is published. | | npmRegistry | string | The host name of the npm registry to publish to. | @@ -5081,7 +5093,7 @@ const clickUpCdkConstructLibraryOptions: clickupCdk.ClickUpCdkConstructLibraryOp | releaseWorkflow | boolean | DEPRECATED: renamed to `release`. | | workflowBootstrapSteps | projen.github.workflows.JobStep[] | Workflow steps to use in order to bootstrap this repo. | | workflowGitIdentity | projen.github.GitIdentity | The git identity to use in workflows. | -| workflowNodeVersion | string | The node version to use in GitHub workflows. | +| workflowNodeVersion | string | The node version used in GitHub Actions workflows. | | workflowPackageCache | boolean | Enable Node.js package cache in GitHub workflows. | | disableTsconfig | boolean | Do not generate a `tsconfig.json` file (used by jsii projects since tsconfig.json is generated by the jsii compiler). | | disableTsconfigDev | boolean | Do not generate a `tsconfig.dev.json` file. | @@ -5860,9 +5872,15 @@ public readonly maxNodeVersion: string; ``` - *Type:* string -- *Default:* no max +- *Default:* no maximum version is enforced -Minimum node.js version to require via `engines` (inclusive). +The maximum node version supported by this package. Most projects should not use this option. + +The value indicates that the package is incompatible with any newer versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option. +Consider this option only if your package is known to not function with newer versions of node. --- @@ -5873,9 +5891,19 @@ public readonly minNodeVersion: string; ``` - *Type:* string -- *Default:* no "engines" specified +- *Default:* no minimum version is enforced + +The minimum node version required by this package to function. Most projects should not use this option. -Minimum Node.js version to require via package.json `engines` (inclusive). +The value indicates that the package is incompatible with any older versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option, even if your package is incompatible with EOL versions of node. +Consider this option only if your package depends on a specific feature, that is not available in other LTS versions. +Setting this option has very high impact on the consumers of your package, +as package managers will actively prevent usage with node versions you have marked as incompatible. + +To change the node version of your CI/CD workflows, use `workflowNodeVersion`. --- @@ -6941,9 +6969,11 @@ public readonly workflowNodeVersion: string; ``` - *Type:* string -- *Default:* same as `minNodeVersion` +- *Default:* `minNodeVersion` if set, otherwise `lts/*`. + +The node version used in GitHub Actions workflows. -The node version to use in GitHub workflows. +Always use this option if your GitHub Actions workflows require a specific to run. --- @@ -7815,8 +7845,8 @@ const clickUpCdkTypeScriptAppOptions: clickupCdk.ClickUpCdkTypeScriptAppOptions | keywords | string[] | Keywords to include in `package.json`. | | license | string | License's SPDX identifier. | | licensed | boolean | Indicates if a license should be added. | -| maxNodeVersion | string | Minimum node.js version to require via `engines` (inclusive). | -| minNodeVersion | string | Minimum Node.js version to require via package.json `engines` (inclusive). | +| maxNodeVersion | string | The maximum node version supported by this package. Most projects should not use this option. | +| minNodeVersion | string | The minimum node version required by this package to function. Most projects should not use this option. | | npmAccess | projen.javascript.NpmAccess | Access level of the npm package. | | npmProvenance | boolean | Should provenance statements be generated when the package is published. | | npmRegistry | string | The host name of the npm registry to publish to. | @@ -7892,7 +7922,7 @@ const clickUpCdkTypeScriptAppOptions: clickupCdk.ClickUpCdkTypeScriptAppOptions | releaseWorkflow | boolean | DEPRECATED: renamed to `release`. | | workflowBootstrapSteps | projen.github.workflows.JobStep[] | Workflow steps to use in order to bootstrap this repo. | | workflowGitIdentity | projen.github.GitIdentity | The git identity to use in workflows. | -| workflowNodeVersion | string | The node version to use in GitHub workflows. | +| workflowNodeVersion | string | The node version used in GitHub Actions workflows. | | workflowPackageCache | boolean | Enable Node.js package cache in GitHub workflows. | | disableTsconfig | boolean | Do not generate a `tsconfig.json` file (used by jsii projects since tsconfig.json is generated by the jsii compiler). | | disableTsconfigDev | boolean | Do not generate a `tsconfig.dev.json` file. | @@ -8663,9 +8693,15 @@ public readonly maxNodeVersion: string; ``` - *Type:* string -- *Default:* no max +- *Default:* no maximum version is enforced -Minimum node.js version to require via `engines` (inclusive). +The maximum node version supported by this package. Most projects should not use this option. + +The value indicates that the package is incompatible with any newer versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option. +Consider this option only if your package is known to not function with newer versions of node. --- @@ -8676,9 +8712,19 @@ public readonly minNodeVersion: string; ``` - *Type:* string -- *Default:* no "engines" specified +- *Default:* no minimum version is enforced + +The minimum node version required by this package to function. Most projects should not use this option. -Minimum Node.js version to require via package.json `engines` (inclusive). +The value indicates that the package is incompatible with any older versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option, even if your package is incompatible with EOL versions of node. +Consider this option only if your package depends on a specific feature, that is not available in other LTS versions. +Setting this option has very high impact on the consumers of your package, +as package managers will actively prevent usage with node versions you have marked as incompatible. + +To change the node version of your CI/CD workflows, use `workflowNodeVersion`. --- @@ -9744,9 +9790,11 @@ public readonly workflowNodeVersion: string; ``` - *Type:* string -- *Default:* same as `minNodeVersion` +- *Default:* `minNodeVersion` if set, otherwise `lts/*`. + +The node version used in GitHub Actions workflows. -The node version to use in GitHub workflows. +Always use this option if your GitHub Actions workflows require a specific to run. --- @@ -10495,8 +10543,8 @@ const clickUpTypeScriptProjectOptions: clickupTs.ClickUpTypeScriptProjectOptions | keywords | string[] | Keywords to include in `package.json`. | | license | string | License's SPDX identifier. | | licensed | boolean | Indicates if a license should be added. | -| maxNodeVersion | string | Minimum node.js version to require via `engines` (inclusive). | -| minNodeVersion | string | Minimum Node.js version to require via package.json `engines` (inclusive). | +| maxNodeVersion | string | The maximum node version supported by this package. Most projects should not use this option. | +| minNodeVersion | string | The minimum node version required by this package to function. Most projects should not use this option. | | npmAccess | projen.javascript.NpmAccess | Access level of the npm package. | | npmProvenance | boolean | Should provenance statements be generated when the package is published. | | npmRegistry | string | The host name of the npm registry to publish to. | @@ -10572,7 +10620,7 @@ const clickUpTypeScriptProjectOptions: clickupTs.ClickUpTypeScriptProjectOptions | releaseWorkflow | boolean | DEPRECATED: renamed to `release`. | | workflowBootstrapSteps | projen.github.workflows.JobStep[] | Workflow steps to use in order to bootstrap this repo. | | workflowGitIdentity | projen.github.GitIdentity | The git identity to use in workflows. | -| workflowNodeVersion | string | The node version to use in GitHub workflows. | +| workflowNodeVersion | string | The node version used in GitHub Actions workflows. | | workflowPackageCache | boolean | Enable Node.js package cache in GitHub workflows. | | disableTsconfig | boolean | Do not generate a `tsconfig.json` file (used by jsii projects since tsconfig.json is generated by the jsii compiler). | | disableTsconfigDev | boolean | Do not generate a `tsconfig.dev.json` file. | @@ -11317,9 +11365,15 @@ public readonly maxNodeVersion: string; ``` - *Type:* string -- *Default:* no max +- *Default:* no maximum version is enforced -Minimum node.js version to require via `engines` (inclusive). +The maximum node version supported by this package. Most projects should not use this option. + +The value indicates that the package is incompatible with any newer versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option. +Consider this option only if your package is known to not function with newer versions of node. --- @@ -11330,9 +11384,19 @@ public readonly minNodeVersion: string; ``` - *Type:* string -- *Default:* no "engines" specified +- *Default:* no minimum version is enforced + +The minimum node version required by this package to function. Most projects should not use this option. -Minimum Node.js version to require via package.json `engines` (inclusive). +The value indicates that the package is incompatible with any older versions of node. +This requirement is enforced via the engines field. + +You will normally not need to set this option, even if your package is incompatible with EOL versions of node. +Consider this option only if your package depends on a specific feature, that is not available in other LTS versions. +Setting this option has very high impact on the consumers of your package, +as package managers will actively prevent usage with node versions you have marked as incompatible. + +To change the node version of your CI/CD workflows, use `workflowNodeVersion`. --- @@ -12398,9 +12462,11 @@ public readonly workflowNodeVersion: string; ``` - *Type:* string -- *Default:* same as `minNodeVersion` +- *Default:* `minNodeVersion` if set, otherwise `lts/*`. + +The node version used in GitHub Actions workflows. -The node version to use in GitHub workflows. +Always use this option if your GitHub Actions workflows require a specific to run. --- diff --git a/package.json b/package.json index eb207a9f..cb33d4fb 100644 --- a/package.json +++ b/package.json @@ -54,17 +54,17 @@ "jsii-pacmak": "^1.100.0", "jsii-rosetta": "~5.4.0", "prettier": "^3.3.2", - "projen": "^0.87.0", + "projen": "^0.90.0", "ts-jest": "^29.1.5", "ts-node": "^10.9.2", "typescript": "^5.5.2" }, "peerDependencies": { - "projen": "^0.87.0" + "projen": "^0.90.0" }, "dependencies": { "cson-parser": "^4.0.9", - "projen": "^0.87.0", + "projen": "^0.90.0", "semver": "^7.6.2", "ts-deepmerge": "^6.2.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0638937c..8bf508ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^4.0.9 version: 4.0.9 projen: - specifier: ^0.87.0 - version: 0.87.0(constructs@10.3.0) + specifier: ^0.90.0 + version: 0.90.0(constructs@10.3.0) semver: specifier: ^7.6.2 version: 7.6.2 @@ -1212,6 +1212,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true espree@9.6.1: @@ -2267,8 +2268,8 @@ packages: process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - projen@0.87.0: - resolution: {integrity: sha512-XGAYLxtNp+azXFQyFRiH3AN4ahw8oolhRz1yq/eowRTuIf/WrX2qjznTR1PGVc1uKauo+3aPEHJz0OfiOUJJLg==} + projen@0.90.0: + resolution: {integrity: sha512-klJXSriGl/w+9Gj22vNenq8DjMBIscaOArt0aSTtPjeZyb5s0OSrDF0ALSzlLfz4x7dT8jRB2C8sb9tuuR/sUA==} engines: {node: '>= 16.0.0'} hasBin: true peerDependencies: @@ -2762,8 +2763,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20240904: - resolution: {integrity: sha512-iGi6VWFGOuxPvDfwfK1/8C172NWzC5gtC4G2dxqCQehrr86WTfFkc9aWucynaxZdwQNMqG1Iu83bmXD7CNHCmg==} + typescript@5.7.0-dev.20241031: + resolution: {integrity: sha512-CR0uSMNCzLCXjptJ38ESiEpTMEYJiplIe9jmZLQuTp5nrxwOE2ljMg5z1XyPI+Uss1saZOdpwkPxXU3mDIASEg==} engines: {node: '>=14.17'} hasBin: true @@ -4163,7 +4164,7 @@ snapshots: dependencies: semver: 7.6.2 shelljs: 0.8.5 - typescript: 5.7.0-dev.20240904 + typescript: 5.7.0-dev.20241031 electron-to-chromium@1.4.811: {} @@ -4284,7 +4285,7 @@ snapshots: debug: 4.3.5 enhanced-resolve: 5.17.0 eslint: 8.57.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) fast-glob: 3.3.2 get-tsconfig: 4.7.5 @@ -4296,7 +4297,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: @@ -4317,7 +4318,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.14.0 is-glob: 4.0.3 @@ -5685,7 +5686,7 @@ snapshots: process-nextick-args@2.0.1: {} - projen@0.87.0(constructs@10.3.0): + projen@0.90.0(constructs@10.3.0): dependencies: constructs: 10.3.0 @@ -6162,7 +6163,7 @@ snapshots: typescript@5.5.2: {} - typescript@5.7.0-dev.20240904: {} + typescript@5.7.0-dev.20241031: {} uglify-js@3.18.0: optional: true diff --git a/test/__snapshots__/clickup-cdk.test.ts.snap b/test/__snapshots__/clickup-cdk.test.ts.snap index b4d75afc..a1996a7d 100644 --- a/test/__snapshots__/clickup-cdk.test.ts.snap +++ b/test/__snapshots__/clickup-cdk.test.ts.snap @@ -150,6 +150,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -357,6 +360,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -821,6 +827,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -1285,6 +1294,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -1476,6 +1488,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -1671,6 +1686,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -1870,6 +1888,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -2061,6 +2082,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest diff --git a/test/__snapshots__/clickup-ts.test.ts.snap b/test/__snapshots__/clickup-ts.test.ts.snap index 4b9053bb..e9de79cc 100644 --- a/test/__snapshots__/clickup-ts.test.ts.snap +++ b/test/__snapshots__/clickup-ts.test.ts.snap @@ -9,6 +9,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -166,17 +169,17 @@ queue_rules: - "#approved-reviews-by>=1" - -label~=(do-not-merge) - status-success=build + merge_method: squash + commit_message_template: |- + {{ title }} (#{{ number }}) + + {{ body }} pull_request_rules: - name: Automatic merge on approval and successful build actions: delete_head_branch: {} queue: - method: squash name: default - commit_message_template: |- - {{ title }} (#{{ number }}) - - {{ body }} conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) diff --git a/test/__snapshots__/datadog-service-catalog.test.ts.snap b/test/__snapshots__/datadog-service-catalog.test.ts.snap index 1fafece0..3868ec2e 100644 --- a/test/__snapshots__/datadog-service-catalog.test.ts.snap +++ b/test/__snapshots__/datadog-service-catalog.test.ts.snap @@ -9,6 +9,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -64,7 +67,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -142,6 +145,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -197,7 +203,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: diff --git a/test/__snapshots__/datadog.test.ts.snap b/test/__snapshots__/datadog.test.ts.snap index 1903b28c..b8c69dc0 100644 --- a/test/__snapshots__/datadog.test.ts.snap +++ b/test/__snapshots__/datadog.test.ts.snap @@ -9,6 +9,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -64,7 +67,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -118,6 +121,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -173,7 +179,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -227,6 +233,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -282,7 +291,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: diff --git a/test/__snapshots__/slack-alert.test.ts.snap b/test/__snapshots__/slack-alert.test.ts.snap index dee54f42..ac60dc6f 100644 --- a/test/__snapshots__/slack-alert.test.ts.snap +++ b/test/__snapshots__/slack-alert.test.ts.snap @@ -9,6 +9,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -64,7 +67,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: @@ -116,6 +119,9 @@ on: branches: - main workflow_dispatch: {} +concurrency: + group: \${{ github.workflow }} + cancel-in-progress: false jobs: release: runs-on: ubuntu-latest @@ -171,7 +177,7 @@ jobs: steps: - uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: lts/* - name: Download build artifacts uses: actions/download-artifact@v4 with: