diff --git a/.gitattributes b/.gitattributes index 2ef2ae75..71ea70ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,6 +9,7 @@ /.github/workflows/build.yml linguist-generated /.github/workflows/pull-request-lint.yml linguist-generated /.github/workflows/release.yml linguist-generated +/.github/workflows/retry-automerge.yml linguist-generated /.github/workflows/upgrade-cdklabs-projen-project-types-main.yml linguist-generated /.github/workflows/upgrade-dev-deps-main.yml linguist-generated /.github/workflows/upgrade-main.yml linguist-generated diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 815b9a4e..d1b38cdb 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 == 'cdklabs-automation' || github.event.pull_request.user.login == 'dependabot[bot]') 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 6d9b9c93..ebc2c947 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,12 +16,12 @@ 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 }} - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: lts/* - name: Install dependencies @@ -37,7 +37,7 @@ jobs: 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 @@ -56,13 +56,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 }} @@ -70,12 +70,12 @@ 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" diff --git a/.github/workflows/pull-request-lint.yml b/.github/workflows/pull-request-lint.yml index 100c15e0..59125900 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 fec8796b..130d4f5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,15 +21,15 @@ 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: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: lts/* - name: Install dependencies @@ -54,7 +54,7 @@ jobs: 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 @@ -67,13 +67,14 @@ jobs: runs-on: ubuntu-latest permissions: contents: write + environment: release 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: lts/* - name: Download build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-artifact path: dist @@ -91,13 +92,14 @@ jobs: permissions: id-token: write contents: read + environment: release 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: lts/* + node-version: 24.x - name: Download build artifacts - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v5 with: name: build-artifact path: dist @@ -109,5 +111,5 @@ jobs: NPM_DIST_TAG: latest NPM_REGISTRY: registry.npmjs.org NPM_CONFIG_PROVENANCE: "true" - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_TRUSTED_PUBLISHER: "true" run: npx -p publib@latest publib-npm diff --git a/.github/workflows/retry-automerge.yml b/.github/workflows/retry-automerge.yml new file mode 100644 index 00000000..47c74a79 --- /dev/null +++ b/.github/workflows/retry-automerge.yml @@ -0,0 +1,18 @@ +# ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". + +name: retry-automerge +on: + pull_request: + types: + - auto_merge_disabled +jobs: + retry-automerge: + runs-on: ubuntu-latest + permissions: {} + steps: + - name: Print github context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Print github event file + run: jq . "$GITHUB_EVENT_PATH" diff --git a/.github/workflows/upgrade-cdklabs-projen-project-types-main.yml b/.github/workflows/upgrade-cdklabs-projen-project-types-main.yml index 56d4625a..17d220bf 100644 --- a/.github/workflows/upgrade-cdklabs-projen-project-types-main.yml +++ b/.github/workflows/upgrade-cdklabs-projen-project-types-main.yml @@ -13,11 +13,11 @@ jobs: patch_created: ${{ steps.create_patch.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 - name: Install dependencies run: yarn install --check-files --frozen-lockfile - name: Upgrade dependencies @@ -31,7 +31,7 @@ jobs: 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 @@ -45,11 +45,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 }} @@ -57,11 +57,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: |- @@ -85,6 +85,6 @@ jobs: ------ *Automatically created by projen via the "upgrade-cdklabs-projen-project-types-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/.github/workflows/upgrade-dev-deps-main.yml b/.github/workflows/upgrade-dev-deps-main.yml index db4f1fdb..92055ba1 100644 --- a/.github/workflows/upgrade-dev-deps-main.yml +++ b/.github/workflows/upgrade-dev-deps-main.yml @@ -4,7 +4,7 @@ name: upgrade-dev-deps-main on: workflow_dispatch: {} schedule: - - cron: 0 18 * * 1 + - cron: 0 22 * * 1 jobs: upgrade: name: Upgrade @@ -15,11 +15,11 @@ jobs: patch_created: ${{ steps.create_patch.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: lts/* - name: Install dependencies @@ -35,7 +35,7 @@ jobs: 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 @@ -49,11 +49,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 }} @@ -61,11 +61,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: |- @@ -89,6 +89,6 @@ jobs: ------ *Automatically created by projen via the "upgrade-dev-deps-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/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml index 82143781..7dc6cb00 100644 --- a/.github/workflows/upgrade-main.yml +++ b/.github/workflows/upgrade-main.yml @@ -15,11 +15,11 @@ jobs: patch_created: ${{ steps.create_patch.outputs.patch_created }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: main - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: node-version: lts/* - name: Install dependencies @@ -35,7 +35,7 @@ jobs: 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 @@ -49,11 +49,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 }} @@ -61,11 +61,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: |- @@ -89,6 +89,6 @@ jobs: ------ *Automatically created by projen via the "upgrade-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 b0fea7a3..8a5d2410 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ junit.xml /dist/ !/.projen/jest-snapshot-resolver.js !/.eslintrc.json +!/.github/workflows/retry-automerge.yml !/.github/workflows/auto-queue.yml !/.github/workflows/upgrade-cdklabs-projen-project-types-main.yml !/.github/workflows/upgrade-main.yml diff --git a/.projen/files.json b/.projen/files.json index f6c70c69..8733a61b 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -7,6 +7,7 @@ ".github/workflows/build.yml", ".github/workflows/pull-request-lint.yml", ".github/workflows/release.yml", + ".github/workflows/retry-automerge.yml", ".github/workflows/upgrade-cdklabs-projen-project-types-main.yml", ".github/workflows/upgrade-dev-deps-main.yml", ".github/workflows/upgrade-main.yml", diff --git a/.projen/tasks.json b/.projen/tasks.json index 0e024608..94e5bf04 100644 --- a/.projen/tasks.json +++ b/.projen/tasks.json @@ -148,7 +148,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/package.json b/package.json index 362da5d1..cf3aea37 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "adm-zip": "^0.5.16", "aws-cdk": "2.1030.0", "aws-cdk-lib": "2.187.0", - "cdklabs-projen-project-types": "^0.3.1", + "cdklabs-projen-project-types": "^0.3.7", "commit-and-tag-version": "^12", "constructs": "10.1.31", "esbuild": "^0.25.11", @@ -72,7 +72,7 @@ "JSONStream": "^1.3.5", "minipass": "3.2.1", "node-ical": "0.15.1", - "projen": "^0.95.0", + "projen": "^0.98.4", "rrule": "^2.8.1", "standard-version": "^9", "tar": "^6.2.1", diff --git a/yarn.lock b/yarn.lock index fd845f04..92d367db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2895,12 +2895,12 @@ case@1.6.3, case@^1.6.3: resolved "https://registry.yarnpkg.com/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9" integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ== -cdklabs-projen-project-types@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cdklabs-projen-project-types/-/cdklabs-projen-project-types-0.3.1.tgz#fa1275772001f7d21be25580df3ec2f547f8f987" - integrity sha512-P+fPV/GF82IynkO+fMmJ8QUxxLPH5OH2bCTxl/aVeTUhpx7l44GdOR1dXAQGkpiX3mYEuDB4gWIJrvgx6MEELg== +cdklabs-projen-project-types@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/cdklabs-projen-project-types/-/cdklabs-projen-project-types-0.3.7.tgz#91b4d2eaa40d8d68507fce834cf0a9409612aafc" + integrity sha512-ixRq2RK/4lW40UBvhJEhU0fvpCFFIu6VEPdW0liJvAy/uypSubRroqQ6N/9rj/uY9pXxK8cYPr7rFJe8Pp0pQg== dependencies: - yaml "^2.8.0" + yaml "^2.8.1" chalk@^2.4.2: version "2.4.2" @@ -6037,10 +6037,10 @@ 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.95.0: - version "0.95.0" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.95.0.tgz#2711c4a134e9e98231f4af73cf15e0ddf8fae232" - integrity sha512-Ytqk+9tVNccwGs7oD35cHEumCdHTDCSOQkpfl4Ok/hmDDFT+l2YzOPWOytL3Uh6F69wHPotRA0nXv7EyV5Gw+A== +projen@^0.98.4: + version "0.98.4" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.98.4.tgz#7ccf0014b7b2d3ff75dc1a8c406ca3c0029ef989" + integrity sha512-v3o7ueUV+J6eRUmEZcg1UdmH1t/nRUrY737iugm9f4AH4v7GVGqDEDd4dIa80hCreIUPruXtUBpyl82h8d7NdA== dependencies: "@iarna/toml" "^2.2.5" case "^1.6.3" @@ -6052,7 +6052,7 @@ projen@^0.95.0: fast-json-patch "^3.1.1" ini "^2.0.0" parse-conflict-json "^4.0.0" - semver "^7.7.2" + semver "^7.7.3" shx "^0.4.0" xmlbuilder2 "^3.1.1" yaml "^2.2.2" @@ -6245,7 +6245,16 @@ resolve.exports@^2.0.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.3.tgz#41955e6f1b4013b7586f873749a635dea07ebe3f" integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.4: +resolve@^1.1.6: + version "1.22.11" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262" + integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ== + dependencies: + is-core-module "^2.16.1" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.4: version "1.22.10" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39" integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w== @@ -7251,7 +7260,7 @@ yaml@1.10.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@^2.2.2, yaml@^2.6.0, yaml@^2.8.0: +yaml@^2.2.2, yaml@^2.6.0, yaml@^2.8.1: version "2.8.1" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79" integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==