diff --git a/.gitattributes b/.gitattributes index 92f1607..becf5c7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,7 +25,6 @@ /.projen/files.json linguist-generated /.projen/tasks.json linguist-generated /API.md linguist-generated -/codecov.yml linguist-generated /LICENSE linguist-generated /package.json linguist-generated /pnpm-lock.yaml linguist-generated diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 93f1e49..19563d4 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -16,6 +16,6 @@ jobs: pull-requests: write if: contains(github.event.pull_request.labels.*.name, 'auto-approve') && (github.event.pull_request.user.login == 'cu-infra-svc-git') steps: - - uses: hmarr/auto-approve-action@v2.2.1 + - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d5c9a6..d332d2b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: CI: "true" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} @@ -30,11 +30,11 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v4 with: - version: "9" + version: 9.15.7 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Install dependencies @@ -42,7 +42,7 @@ jobs: - name: build run: npx projen build - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -51,10 +51,11 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + shell: bash working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.6.2 with: name: repo.patch path: repo.patch @@ -69,7 +70,7 @@ jobs: run: cd dist && getfacl -R . > permissions-backup.acl continue-on-error: true - name: Upload artifact - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.6.2 with: name: build-artifact path: dist @@ -82,13 +83,13 @@ jobs: if: always() && needs.build.outputs.self_mutation_happened && !(github.event.pull_request.head.repo.full_name != github.repository) steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: token: ${{ secrets.PROJEN_GITHUB_TOKEN }} ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Download patch - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: repo.patch path: ${{ runner.temp }} @@ -96,15 +97,15 @@ jobs: run: '[ -s ${{ runner.temp }}/repo.patch ] && git apply ${{ runner.temp }}/repo.patch || echo "Empty patch. Skipping."' - name: Set git identity run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Push changes env: PULL_REQUEST_REF: ${{ github.event.pull_request.head.ref }} run: |- git add . git commit -s -m "chore: self mutation" - git push origin HEAD:$PULL_REQUEST_REF + git push origin "HEAD:$PULL_REQUEST_REF" package-js: needs: build runs-on: ubuntu-latest @@ -112,11 +113,11 @@ jobs: contents: read if: ${{ !needs.build.outputs.self_mutation_happened }} steps: - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Download build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-artifact path: dist @@ -134,11 +135,11 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v4 with: - version: "9" + version: 9.15.7 - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml index 100c15e..5912590 100644 --- a/.github/workflows/pull-request-lint.yml +++ b/.github/workflows/pull-request-lint.yml @@ -19,7 +19,7 @@ jobs: 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 + - uses: amannn/action-semantic-pull-request@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e02c958..00c7621 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,13 +21,13 @@ jobs: CI: "true" steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Set git identity run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: GitHub Packages authorization env: NPM_TOKEN: ${{ secrets.ALL_PACKAGE_READ_TOKEN }} @@ -39,11 +39,11 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v4 with: - version: "9" + version: 9.15.7 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Install dependencies @@ -51,7 +51,7 @@ jobs: - name: release run: npx projen release - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage @@ -66,13 +66,14 @@ jobs: run: |- echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT cat $GITHUB_OUTPUT + shell: bash - name: Backup artifact permissions if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} run: cd dist && getfacl -R . > permissions-backup.acl continue-on-error: true - name: Upload artifact if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.6.2 with: name: build-artifact path: dist @@ -87,11 +88,11 @@ jobs: contents: write if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha steps: - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Download build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-artifact path: dist @@ -111,11 +112,11 @@ jobs: packages: write if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha steps: - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Download build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-artifact path: dist @@ -133,11 +134,11 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v4 with: - version: "9" + version: 9.15.7 - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: .repo - name: Install Dependencies diff --git a/.github/workflows/update-projen-main.yml b/.github/workflows/update-projen-main.yml index 84a6e7e..00c78ee 100644 --- a/.github/workflows/update-projen-main.yml +++ b/.github/workflows/update-projen-main.yml @@ -15,7 +15,7 @@ jobs: patch_created: ${{ steps.create_patch.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main - name: GitHub Packages authorization @@ -29,11 +29,11 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup pnpm - uses: pnpm/action-setup@v3 + uses: pnpm/action-setup@v4 with: - version: "9" + version: 9.15.7 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: 22.14.0 - name: Install dependencies @@ -45,10 +45,11 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + shell: bash working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4.6.2 with: name: repo.patch path: repo.patch @@ -62,11 +63,11 @@ jobs: if: ${{ needs.upgrade.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main - name: Download patch - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: repo.patch path: ${{ runner.temp }} @@ -74,11 +75,11 @@ jobs: run: '[ -s ${{ runner.temp }}/repo.patch ] && git apply ${{ runner.temp }}/repo.patch || echo "Empty patch. Skipping."' - name: Set git identity run: |- - git config user.name "github-actions" - git config user.email "github-actions@github.com" + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Create Pull Request id: create-pr - uses: peter-evans/create-pull-request@v6 + uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.PROJEN_GITHUB_TOKEN }} commit-message: |- @@ -102,6 +103,6 @@ jobs: ------ *Automatically created by projen via the "update-projen-main" workflow* - author: github-actions - committer: github-actions + author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> signoff: true diff --git a/.gitignore b/.gitignore index bf13210..13b5ee3 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,8 @@ junit.xml /dist/changelog.md /dist/version.txt !/.github/workflows/release.yml +codecov +codecov.* !/.mergify.yml !/.github/pull_request_template.md !/.prettierignore @@ -57,7 +59,6 @@ junit.xml .jsii tsconfig.json !/API.md -!/codecov.yml !/.nvmrc !/.github/workflows/renovate.yml !/.github/workflows/add-to-project.yml diff --git a/.mergify.yml b/.mergify.yml index e8c3ed2..d512092 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,7 +3,7 @@ queue_rules: - name: default update_method: merge - conditions: + queue_conditions: - "#approved-reviews-by>=1" - -label~=(do-not-merge) - status-success=build @@ -24,3 +24,5 @@ pull_request_rules: - -label~=(do-not-merge) - status-success=build - status-success=package-js +merge_queue: + max_parallel_checks: 1 diff --git a/.projen/files.json b/.projen/files.json index 0570322..2b497f7 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -20,7 +20,6 @@ ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", - "codecov.yml", "LICENSE", "renovate.json5", "tsconfig.dev.json" diff --git a/.projen/tasks.json b/.projen/tasks.json index 924eb00..54eebf9 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -126,7 +126,8 @@ "name": "eslint", "description": "Runs eslint against the codebase", "env": { - "ESLINT_USE_FLAT_CONFIG": "false" + "ESLINT_USE_FLAT_CONFIG": "false", + "NODE_NO_WARNINGS": "1" }, "steps": [ { diff --git a/.projenrc.ts b/.projenrc.ts index 3a2f98e..837d590 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -1,5 +1,4 @@ import { clickupCdk } from '@time-loop/clickup-projen'; -import { javascript } from 'projen'; const name = 'cdk-named-environments'; const project = new clickupCdk.ClickUpCdkConstructLibrary({ @@ -12,8 +11,6 @@ const project = new clickupCdk.ClickUpCdkConstructLibrary({ minMajorVersion: 1, name, projenrcTs: true, - packageManager: javascript.NodePackageManager.PNPM, - pnpmVersion: '9', repositoryUrl: `https://github.com/time-loop/${name}.git`, }); project.synth(); diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index fb30b58..0000000 --- a/codecov.yml +++ /dev/null @@ -1,34 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". - -coverage: - precision: 2 - round: down - status: - project: - default: - target: auto - threshold: 10% - paths: - - src - if_ci_failed: error - only_pulls: true - patch: - default: - base: auto - target: auto - threshold: 10% - paths: - - src - if_ci_failed: error - only_pulls: true -parsers: - gcov: - branch_detection: - conditional: yes - loop: yes - method: no - macro: no -comment: - layout: reach,diff,flags,files,footer - behavior: default - require_changes: no diff --git a/package.json b/package.json index bb9d383..1c6e93a 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "organization": true }, "devDependencies": { - "@time-loop/clickup-projen": "^1.19.17", + "@time-loop/clickup-projen": "^1.22.0", "@types/jest": "^29.5.14", "@types/node": "^18", "@typescript-eslint/eslint-plugin": "^8", @@ -58,7 +58,7 @@ "jsii-release": "^0.2.1013", "jsii-rosetta": "~5.8.0", "prettier": "^3.6.2", - "projen": "^0.92.10", + "projen": "^0.98.3", "ts-jest": "^29.4.1", "ts-node": "^10", "typescript": "~5.7.0" @@ -138,6 +138,6 @@ "rootDir": "src" } }, - "packageManager": "pnpm@9.15.5", + "packageManager": "pnpm@9.15.7", "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 77b9cb3..09d4f6f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@time-loop/clickup-projen': - specifier: ^1.19.17 - version: 1.19.17(projen@0.92.10(constructs@10.0.5)) + specifier: ^1.22.0 + version: 1.22.0(projen@0.98.3(constructs@10.0.5)) '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -78,8 +78,8 @@ importers: specifier: ^3.6.2 version: 3.6.2 projen: - specifier: ^0.92.10 - version: 0.92.10(constructs@10.0.5) + specifier: ^0.98.3 + version: 0.98.3(constructs@10.0.5) ts-jest: specifier: ^29.4.1 version: 29.4.1(@babel/core@7.24.5)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.24.5))(esbuild@0.24.0)(jest-util@29.7.0)(jest@29.7.0(@types/node@18.19.33)(ts-node@10.9.2(@types/node@18.19.33)(typescript@5.7.3)))(typescript@5.7.3) @@ -929,11 +929,11 @@ packages: resolution: {integrity: sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==} engines: {node: '>=18.0.0'} - '@time-loop/clickup-projen@1.19.17': - resolution: {integrity: sha512-MwCdSwvO7fPnaR8Km9iwvJ9Lc8YpuDLv4kdEHZr9fnW2fhiaax8Fkzro3jvsyh/s1QbVjckePKHaCky9vZ1f0g==, tarball: https://npm.pkg.github.com/download/@time-loop/clickup-projen/1.19.17/f504f0481c414b340aa6b823364cbaaf93f6a661} + '@time-loop/clickup-projen@1.22.0': + resolution: {integrity: sha512-vuUQC/nv0BBhW84U2Ukb7xWu4PNe5UO/zRzrrRf/6aRVV9Zqktn9KaDO2RqWv2K51QpCbdTV6FJIMtF0kK2IiA==, tarball: https://npm.pkg.github.com/download/@time-loop/clickup-projen/1.22.0/39df25c818cb77965213ea388799f9ec2ee8f346} engines: {node: '>= 18.17.1'} peerDependencies: - projen: ^0.92.8 + projen: ^0.98.3 bundledDependencies: - cson-parser - semver @@ -3137,8 +3137,8 @@ packages: process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - projen@0.92.10: - resolution: {integrity: sha512-c60xtQbkPt1tseUhMdCCUURdzcYaV5/Z5OxLJlNQzONwh/0VmpHKEW/creY8X7tw8hk4WgtMKhwisajJHkcf0Q==} + projen@0.98.3: + resolution: {integrity: sha512-zGGQcDzB2C1uzur6DMsHmA3FK52GsbZEaZYGIKHE/sdgTL/sMA0zlToLtR/hLi1QEpE/KBxr4E6MDTCJI4NvyA==} engines: {node: '>= 16.0.0'} hasBin: true peerDependencies: @@ -3149,8 +3149,8 @@ packages: - chalk - comment-json - conventional-changelog-config-spec + - fast-glob - fast-json-patch - - glob - ini - parse-conflict-json - semver @@ -5215,9 +5215,9 @@ snapshots: '@smithy/util-buffer-from': 4.0.0 tslib: 2.6.2 - '@time-loop/clickup-projen@1.19.17(projen@0.92.10(constructs@10.0.5))': + '@time-loop/clickup-projen@1.22.0(projen@0.98.3(constructs@10.0.5))': dependencies: - projen: 0.92.10(constructs@10.0.5) + projen: 0.98.3(constructs@10.0.5) '@tsconfig/node10@1.0.11': {} @@ -7908,7 +7908,7 @@ snapshots: process-nextick-args@2.0.1: {} - projen@0.92.10(constructs@10.0.5): + projen@0.98.3(constructs@10.0.5): dependencies: constructs: 10.0.5 diff --git a/renovate.json5 b/renovate.json5 index 15d2d17..25155a8 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -52,6 +52,12 @@ "Applying major version updates without understanding what they do has caused outages at ClickUp. Don't be that guy. Read the release notes. The release notes are in a link buried in the rollup below. Sorry, unfortunately Renovate does not offer a reasonable way to expose them here. If in doubt, escalate to CloudPlatform.", "CloudPlatform thanks you for being diligent with your library updates!" ] + }, + { + "matchPackageNames": [ + "@time-loop/{/,}**" + ], + "minimumReleaseAge": "0 days" } ], "ignoreDeps": [ @@ -71,11 +77,23 @@ "node", "@time-loop/clickup-projen", "pnpm", - "projen" + "projen", + "hmarr/auto-approve-action", + "actions/checkout", + "actions/download-artifact", + "pnpm/action-setup", + "amannn/action-semantic-pull-request", + "actions/setup-node", + "codecov/codecov-action", + "actions/upload-artifact", + "Glennmen/datadog-event-action", + "rtCamp/action-slack-notify", + "peter-evans/create-pull-request" ], "rangeStrategy": "bump", "prHourlyLimit": 0, "prConcurrentLimit": 0, "automergeType": "pr", - "platformAutomerge": true + "platformAutomerge": true, + "minimumReleaseAge": "7 days" }