From 71b51e022972fed619ee84797e26d2c8652bea55 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 1 Oct 2024 00:26:00 +0000 Subject: [PATCH] fix(deps): upgrade projen Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/time-loop/cdk-aurora/actions/runs/11116271213 ------ *Automatically created by projen via the "update-projen-main" workflow* Signed-off-by: github-actions --- .github/workflows/build.yml | 35 +++++++++++++++--------- .github/workflows/release.yml | 23 ++++++++++------ .github/workflows/update-projen-main.yml | 12 ++++---- .projen/tasks.json | 2 +- package.json | 4 +-- pnpm-lock.yaml | 32 +++++++++++----------- 6 files changed, 61 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a87438b..660be1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,26 +50,26 @@ jobs: id: self_mutation run: |- git add . - git diff --staged --patch --exit-code > .repo.patch || echo "self_mutation_happened=true" >> $GITHUB_OUTPUT + 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@v4.3.6 + uses: actions/upload-artifact@v4.4.0 with: - name: .repo.patch - path: .repo.patch + name: repo.patch + path: repo.patch overwrite: true - name: Fail build on mutation if: steps.self_mutation.outputs.self_mutation_happened run: |- echo "::error::Files were changed during build (see build log). If this was triggered from a fork, you will need to update your branch." - cat .repo.patch + cat repo.patch exit 1 - name: Backup artifact permissions run: cd dist && getfacl -R . > permissions-backup.acl continue-on-error: true - name: Upload artifact - uses: actions/upload-artifact@v4.3.6 + uses: actions/upload-artifact@v4.4.0 with: name: build-artifact path: dist @@ -90,10 +90,10 @@ jobs: - name: Download patch uses: actions/download-artifact@v4 with: - name: .repo.patch + name: repo.patch path: ${{ runner.temp }} - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' + 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" @@ -108,8 +108,9 @@ jobs: package-js: needs: build runs-on: ubuntu-latest - permissions: {} - if: "! needs.build.outputs.self_mutation_happened" + permissions: + contents: read + if: ${{ !needs.build.outputs.self_mutation_happened }} steps: - uses: actions/setup-node@v4 with: @@ -136,11 +137,19 @@ jobs: uses: pnpm/action-setup@v3 with: version: "9" - - name: Prepare Repository - run: mv dist .repo + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + path: .repo - name: Install Dependencies run: cd .repo && pnpm i --frozen-lockfile + - name: Extract build artifact + run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo + - name: Move build artifact out of the way + run: mv dist dist.old - name: Create js artifact run: cd .repo && npx projen package:js - - name: Collect js Artifact + - name: Collect js artifact run: mv .repo/dist dist diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7102a0e..6bce167 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 @@ -55,7 +58,7 @@ jobs: - name: Check if version has already been tagged id: check_tag_exists run: |- - TAG=$(cat dist/dist/releasetag.txt) + 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 @@ -69,7 +72,7 @@ jobs: continue-on-error: true - name: Upload artifact if: ${{ steps.git_remote.outputs.latest_commit == github.sha }} - uses: actions/upload-artifact@v4.3.6 + uses: actions/upload-artifact@v4.4.0 with: name: build-artifact path: dist @@ -95,10 +98,6 @@ jobs: - name: Restore build artifact permissions run: cd dist && setfacl --restore=permissions-backup.acl continue-on-error: true - - name: Prepare Repository - run: mv dist .repo - - name: Collect GitHub Metadata - run: mv .repo/dist dist - name: Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -139,15 +138,21 @@ jobs: uses: pnpm/action-setup@v3 with: version: "9" - - name: Prepare Repository - run: mv dist .repo + - name: Checkout + uses: actions/checkout@v4 + with: + path: .repo - name: Install Dependencies run: cd .repo && pnpm i --frozen-lockfile - name: Remove ~/.npmrc file for release run: rm ~/.npmrc || true + - name: Extract build artifact + run: tar --strip-components=1 -xzvf dist/js/*.tgz -C .repo + - name: Move build artifact out of the way + run: mv dist dist.old - name: Create js artifact run: cd .repo && npx projen package:js - - name: Collect js Artifact + - name: Collect js artifact run: mv .repo/dist dist - name: Release env: diff --git a/.github/workflows/update-projen-main.yml b/.github/workflows/update-projen-main.yml index 9b30640..44fa12d 100644 --- a/.github/workflows/update-projen-main.yml +++ b/.github/workflows/update-projen-main.yml @@ -44,14 +44,14 @@ jobs: id: create_patch run: |- git add . - git diff --staged --patch --exit-code > .repo.patch || echo "patch_created=true" >> $GITHUB_OUTPUT + 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@v4.3.6 + uses: actions/upload-artifact@v4.4.0 with: - name: .repo.patch - path: .repo.patch + name: repo.patch + path: repo.patch overwrite: true pr: name: Create Pull Request @@ -68,10 +68,10 @@ jobs: - name: Download patch uses: actions/download-artifact@v4 with: - name: .repo.patch + name: repo.patch path: ${{ runner.temp }} - name: Apply patch - run: '[ -s ${{ runner.temp }}/.repo.patch ] && git apply ${{ runner.temp }}/.repo.patch || echo "Empty patch. Skipping."' + 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" diff --git a/.projen/tasks.json b/.projen/tasks.json index e168b58..5a7470f 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -155,7 +155,7 @@ "description": "Creates the distribution package", "steps": [ { - "exec": "rsync -a . .repo --exclude .git --exclude node_modules && rm -rf dist && mv .repo dist", + "spawn": "package:js", "condition": "node -e \"if (!process.env.CI) process.exit(1)\"" }, { diff --git a/package.json b/package.json index a0b8b57..bfbdfab 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "organization": true }, "devDependencies": { - "@time-loop/clickup-projen": "^1.13.2", + "@time-loop/clickup-projen": "^1.13.3", "@types/jest": "^29.5.12", "@types/node": "^18", "@types/pg": "^8.11.6", @@ -63,7 +63,7 @@ "jsii-rosetta": "~5.3.0", "multi-convention-namer": "0.1.12", "prettier": "^3.3.3", - "projen": "^0.86.7", + "projen": "^0.87.4", "sinon": "^18.0.0", "sinon-spy-utils": "^1.0.6", "ts-jest": "^29.2.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 47ccbe3..64b46c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,8 +25,8 @@ importers: version: 1.0.4 devDependencies: '@time-loop/clickup-projen': - specifier: ^1.13.2 - version: 1.13.2(projen@0.86.7(constructs@10.0.5)) + specifier: ^1.13.3 + version: 1.13.3(projen@0.87.4(constructs@10.0.5)) '@types/jest': specifier: ^29.5.12 version: 29.5.12 @@ -109,8 +109,8 @@ importers: specifier: ^3.3.3 version: 3.3.3 projen: - specifier: ^0.86.7 - version: 0.86.7(constructs@10.0.5) + specifier: ^0.87.4 + version: 0.87.4(constructs@10.0.5) sinon: specifier: ^18.0.0 version: 18.0.0 @@ -986,11 +986,11 @@ packages: resolution: {integrity: sha512-4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==} engines: {node: '>=16.0.0'} - '@time-loop/clickup-projen@1.13.2': - resolution: {integrity: sha512-161UQiklCwKWA9XbQIcvl3z4iHbi4UvcFLa7b/IDSOZFW641lOejr39T6/lomBsPlGschGs8wO2VpoEDoRKo/g==, tarball: https://npm.pkg.github.com/download/@time-loop/clickup-projen/1.13.2/955b19a4c8c5857ac3a30b3cd2fddfa429aa365d} + '@time-loop/clickup-projen@1.13.3': + resolution: {integrity: sha512-6Dy+reVqvjYj+LcpT4oxEJjviCSMPJimNTPr9O/7gE88Qxy/dFt9hEew6+CCQlSO2V3lFlPg5VnZyoPuzaE0sw==, tarball: https://npm.pkg.github.com/download/@time-loop/clickup-projen/1.13.3/cc6fd046ee5f9a2304f46341c48d49821a84b217} engines: {node: '>= 18.17.1'} peerDependencies: - projen: ^0.86.7 + projen: ^0.87.0 bundledDependencies: - cson-parser - semver @@ -3050,8 +3050,8 @@ packages: process-nextick-args@2.0.1: resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} - projen@0.86.7: - resolution: {integrity: sha512-bNJVggJggmKaNGwoQ0FK1OgVbLv7Uf3hzKRkU3n5R4LhcfGoLFWvvZ9Y4fI/+FEowqhNrnukiG8Z2PhIMjuxwg==} + projen@0.87.4: + resolution: {integrity: sha512-PJA8xQubV/1x5S4xbP2uazpkTd5zYb7JqEprGxNZ+KNsWUab0MK2cXeYgW6zp/xpITiD+l9Z0fR5TG83OyU6nQ==} engines: {node: '>= 16.0.0'} hasBin: true peerDependencies: @@ -3565,8 +3565,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - typescript@5.7.0-dev.20240903: - resolution: {integrity: sha512-XTUc5uVwBbLlT0v3FqTx9sDN1MLQnT5mwSC3JefCrcKT6Zv+rPcQE7HLKM9IsrNiM1tiaQvamJTgVH0S+UMH2A==} + typescript@5.7.0-dev.20240930: + resolution: {integrity: sha512-mGW96cpbwcYuc264UPqGpKBLNebFFtVEXRLPwSwxVEub9tSyMI+XGFGxsznop7pU8E1ntx4OC4cN1n5MnzO0+Q==} engines: {node: '>=14.17'} hasBin: true @@ -5207,9 +5207,9 @@ snapshots: '@smithy/types': 3.3.0 tslib: 2.6.2 - '@time-loop/clickup-projen@1.13.2(projen@0.86.7(constructs@10.0.5))': + '@time-loop/clickup-projen@1.13.3(projen@0.87.4(constructs@10.0.5))': dependencies: - projen: 0.86.7(constructs@10.0.5) + projen: 0.87.4(constructs@10.0.5) '@tsconfig/node10@1.0.11': {} @@ -5995,7 +5995,7 @@ snapshots: dependencies: semver: 7.6.2 shelljs: 0.8.5 - typescript: 5.7.0-dev.20240903 + typescript: 5.7.0-dev.20240930 ejs@3.1.10: dependencies: @@ -7724,7 +7724,7 @@ snapshots: process-nextick-args@2.0.1: {} - projen@0.86.7(constructs@10.0.5): + projen@0.87.4(constructs@10.0.5): dependencies: constructs: 10.0.5 @@ -8240,7 +8240,7 @@ snapshots: typescript@5.3.3: {} - typescript@5.7.0-dev.20240903: {} + typescript@5.7.0-dev.20240930: {} uglify-js@3.17.4: optional: true