From 81856055f6610356f9f037ba46112e3dd8f6d92b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 5 Apr 2024 09:45:30 +0000 Subject: [PATCH] fix(deps): upgrade projen Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/time-loop/cdk-log-parser/actions/runs/8567876348 ------ *Automatically created by projen via the "update-projen-main" workflow* Signed-off-by: github-actions --- .github/workflows/build.yml | 14 +++++---- .github/workflows/pull-request-lint.yml | 3 +- .github/workflows/release.yml | 38 +++++++++++++++--------- .github/workflows/renovate.yml | 4 +-- .github/workflows/semgrep.yml | 2 +- .github/workflows/update-projen-main.yml | 16 +++++----- .gitignore | 2 +- .npmignore | 4 +++ .nvmrc | 2 +- .projen/tasks.json | 5 ++-- package.json | 2 +- renovate.json5 | 2 +- tsconfig.dev.json | 1 - yarn.lock | 38 ++++++------------------ 14 files changed, 65 insertions(+), 68 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 678b209..19722ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: CI: "true" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} @@ -30,9 +30,9 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.11.1 - name: Install dependencies run: yarn install --check-files - name: build @@ -47,12 +47,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.self_mutation.outputs.self_mutation_happened - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: .repo.patch path: .repo.patch + overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- @@ -67,13 +69,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@v3 + uses: actions/checkout@v4 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@v3 + uses: actions/download-artifact@v4 with: name: .repo.patch path: ${{ runner.temp }} diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml index 3c16c6d..2c1c658 100644 --- a/.github/workflows/pull-request-lint.yml +++ b/.github/workflows/pull-request-lint.yml @@ -17,7 +17,7 @@ jobs: permissions: pull-requests: write steps: - - uses: amannn/action-semantic-pull-request@v5.0.2 + - uses: amannn/action-semantic-pull-request@v5.4.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -26,4 +26,3 @@ jobs: fix chore requireScope: false - githubBaseUrl: ${{ github.api_url }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 592f43f..de06619 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,12 @@ jobs: contents: write outputs: latest_commit: ${{ steps.git_remote.outputs.latest_commit }} + tag_exists: ${{ steps.check_tag_exists.outputs.exists }} env: CI: "true" steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set git identity @@ -35,9 +36,9 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.11.1 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: release @@ -47,32 +48,41 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} directory: coverage + - name: Check if version has already been tagged + id: check_tag_exists + run: |- + TAG=$(cat dist/releasetag.txt) + ([ ! -z "$TAG" ] && git ls-remote -q --exit-code --tags origin $TAG && (echo "exists=true" >> $GITHUB_OUTPUT)) || (echo "exists=false" >> $GITHUB_OUTPUT) + cat $GITHUB_OUTPUT - name: Check for new commits id: git_remote - run: echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT + run: |- + echo "latest_commit=$(git ls-remote origin -h ${{ github.ref }} | cut -f1)" >> $GITHUB_OUTPUT + cat $GITHUB_OUTPUT - 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@v3 + uses: actions/upload-artifact@v4 with: name: build-artifact path: dist + overwrite: true release_github: name: Publish to GitHub Releases needs: release runs-on: ubuntu-latest permissions: contents: write - if: needs.release.outputs.latest_commit == github.sha + if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.11.1 - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-artifact path: dist @@ -92,13 +102,13 @@ jobs: permissions: contents: read packages: write - if: needs.release.outputs.latest_commit == github.sha + if: needs.release.outputs.tag_exists != 'true' && needs.release.outputs.latest_commit == github.sha steps: - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.11.1 - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-artifact path: dist @@ -120,7 +130,7 @@ jobs: if: needs.release.outputs.latest_commit == github.sha steps: - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-artifact path: dist diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 949acd5..5d0c06e 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -26,9 +26,9 @@ jobs: contents: read steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Self-hosted Renovate - uses: renovatebot/github-action@v39.0.1 + uses: renovatebot/github-action@v40.1.6 if: (github.event_name != 'issues' && github.event_name != 'pull_request') || github.actor != 'cu-infra-svc-git' with: configurationFile: renovate.json5 diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index ab3a9d2..e24618b 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -12,7 +12,7 @@ jobs: name: Scan runs-on: ubuntu-latest container: - image: returntocorp/semgrep@sha256:6c7ab81e4d1fd25a09f89f1bd52c984ce107c6ff33affef6ca3bc626a4cc479b + image: semgrep/semgrep@sha256:d08d065e4041a222e7b54ed2ad8faddfef978bcc210aa9d0b6da93d251082808 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/update-projen-main.yml b/.github/workflows/update-projen-main.yml index 04e0806..f67d134 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@v3 + uses: actions/checkout@v4 with: ref: main - name: GitHub Packages authorization @@ -29,9 +29,9 @@ jobs: - name: Make cdk-ecr-deployment sane run: export FORCE_PREBUILT_LAMBDA=1 - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18.17.1 + node-version: 20.11.1 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies @@ -41,12 +41,14 @@ jobs: run: |- git add . git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + working-directory: ./ - name: Upload patch if: steps.create_patch.outputs.patch_created - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: .repo.patch path: .repo.patch + overwrite: true pr: name: Create Pull Request needs: upgrade @@ -56,11 +58,11 @@ jobs: if: ${{ needs.upgrade.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: main - name: Download patch - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: .repo.patch path: ${{ runner.temp }} @@ -72,7 +74,7 @@ jobs: git config user.email "github-actions@github.com" - name: Create Pull Request id: create-pr - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.PROJEN_GITHUB_TOKEN }} commit-message: |- diff --git a/.gitignore b/.gitignore index 8205a1b..403238f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,6 @@ jspm_packages/ .idea .yalc yalc.lock -!/.projenrc.js /test-reports/ junit.xml /coverage/ @@ -64,3 +63,4 @@ junit.xml !/.github/workflows/update-projen-main.yml !/.github/workflows/add-to-update-projen-project.yml !/typedoc.json +!/.projenrc.ts diff --git a/.npmignore b/.npmignore index 68ff5de..800fadd 100644 --- a/.npmignore +++ b/.npmignore @@ -7,6 +7,8 @@ permissions-backup.acl /dist/changelog.md /dist/version.txt /.mergify.yml +/.prettierignore +/.prettierrc.json /test/ /tsconfig.dev.json /src/ @@ -21,3 +23,5 @@ dist /.projenrc.js tsconfig.tsbuildinfo /.eslintrc.json +/.gitattributes +/.projenrc.ts diff --git a/.nvmrc b/.nvmrc index 7ec5619..726a201 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18.17.1 \ No newline at end of file +20.11.1 \ No newline at end of file diff --git a/.projen/tasks.json b/.projen/tasks.json index 3037c11..554717e 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -108,7 +108,8 @@ "description": "Runs eslint against the codebase", "steps": [ { - "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools projenrc .projenrc.ts" + "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern $@ src test build-tools projenrc .projenrc.ts", + "receiveArgs": true } ] }, @@ -262,7 +263,7 @@ }, "steps": [ { - "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/jest,@types/node,@typescript-eslint/eslint-plugin,@typescript-eslint/parser,constructs,esbuild,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,eslint,jest,jest-junit,jsii-release,prettier,projen,standard-version,ts-jest,ts-node,typedoc,typedoc-plugin-markdown,typescript,@time-loop/clickup-projen,aws-cdk-lib,aws-sdk" + "exec": "npx npm-check-updates@16 --upgrade --target=minor --peer --dep=dev,peer,prod,optional --filter=@types/jest,esbuild,eslint-config-prettier,eslint-import-resolver-typescript,eslint-plugin-import,eslint-plugin-prettier,jest,jsii-release,prettier,projen,ts-jest,typedoc,typedoc-plugin-markdown,typescript,@time-loop/clickup-projen,aws-cdk-lib,aws-sdk" }, { "exec": "yarn install --check-files" diff --git a/package.json b/package.json index cec2a73..1060514 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "typescript": "^5.4.4" }, "dependencies": { - "@time-loop/clickup-projen": "^0.0.200", + "@time-loop/clickup-projen": "^1.5.3", "aws-cdk-lib": "^2.135.0", "aws-sdk": "^2.1593.0" }, diff --git a/renovate.json5 b/renovate.json5 index 14538a7..ef5881f 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -4,7 +4,7 @@ "renovate" ], "schedule": [ - "before 1am on Monday" + "before 2am on Monday" ], "extends": [ "config:base", diff --git a/tsconfig.dev.json b/tsconfig.dev.json index 88cc2f2..da832d0 100644 --- a/tsconfig.dev.json +++ b/tsconfig.dev.json @@ -26,7 +26,6 @@ "target": "ES2019" }, "include": [ - ".projenrc.js", "src/**/*.ts", "test/**/*.ts", ".projenrc.ts", diff --git a/yarn.lock b/yarn.lock index 6a02152..d22074b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1702,15 +1702,15 @@ "@smithy/util-buffer-from" "^2.2.0" tslib "^2.6.2" -"@time-loop/clickup-projen@^0.0.200": - version "0.0.200" - resolved "https://npm.pkg.github.com/download/@time-loop/clickup-projen/0.0.200/c73b6672d884715f740957651d4fb11f12c77df2#c73b6672d884715f740957651d4fb11f12c77df2" - integrity sha512-NxFvUuYAZlr4QUcM496UbrrqJsBQb0Lij2wgXiBH2icH7BCLBfKbYrNr6hRP+F5rO2gpkWMCCc/BeUD8q7dOuQ== +"@time-loop/clickup-projen@^1.5.3": + version "1.5.3" + resolved "https://npm.pkg.github.com/download/@time-loop/clickup-projen/1.5.3/d8afaad21d85663e75291323716008ffeba46885#d8afaad21d85663e75291323716008ffeba46885" + integrity sha512-I3ZefhM9DlAYaRGqVZie77vZHzHapU8AK0DAjq2dqymaceSzs2sudiPr2+mDW5IKNyWgsM80MO0SOJGdycz6yg== dependencies: cson-parser "^4.0.9" - projen "^0.77.4" - semver "^7.5.4" - ts-deepmerge "^6.2.0" + projen "^0.80.4" + semver "^7.6.0" + ts-deepmerge "^6.2.1" "@tootallnate/once@1": version "1.1.2" @@ -5520,27 +5520,7 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -projen@^0.77.4: - version "0.77.6" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.77.6.tgz#480c1af4246bba55e8d0732ff7a9d1804ce414be" - integrity sha512-nXbbDr81UjfLjCfVfHGfGPIjiN7INSyMUa52FYupX0TmybMq+CnvX8o0O45feOLLhsifNq7EHXtF+hgBtpBb8A== - dependencies: - "@iarna/toml" "^2.2.5" - case "^1.6.3" - chalk "^4.1.2" - comment-json "4.2.2" - constructs "^10.0.0" - conventional-changelog-config-spec "^2.1.0" - fast-json-patch "^3.1.1" - glob "^8" - ini "^2.0.0" - semver "^7.5.4" - shx "^0.3.4" - xmlbuilder2 "^3.1.1" - yaml "^2.2.2" - yargs "^17.7.2" - -projen@^0.80.18: +projen@^0.80.18, projen@^0.80.4: version "0.80.18" resolved "https://registry.yarnpkg.com/projen/-/projen-0.80.18.tgz#909af3b4b4178a05346c336bd7fcfe0c3c2c17a8" integrity sha512-qmSUsXQYUdc0uIJLZeIZVP8EC2rtPFGOxz1/IC46HW0wJgRD/zXUNfXhwiPhrHNfoGZpkrBsfbHZV6x9YC3cgw== @@ -6321,7 +6301,7 @@ ts-api-utils@^1.0.1: resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.2.tgz#7c094f753b6705ee4faee25c3c684ade52d66d99" integrity sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ== -ts-deepmerge@^6.2.0: +ts-deepmerge@^6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/ts-deepmerge/-/ts-deepmerge-6.2.1.tgz#4d564b44bc2a69e35a0b08bfa904ef176372e7dd" integrity sha512-8CYSLazCyj0DJDpPIxOFzJG46r93uh6EynYjuey+bxcLltBeqZL7DMfaE5ZPzZNFlav7wx+2TDa/mBl8gkTYzw==