From b34d87de479d41157e2743aaf37abaa77fa6fa9a Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 21 Oct 2024 15:06:56 +0000 Subject: [PATCH] chore(deps): upgrade configuration Upgrades project dependencies. See details in [workflow run]. [Workflow Run]: https://github.com/cdk8s-team/cdk8s-core/actions/runs/11443066765 ------ *Automatically created by projen via the "upgrade-configuration-1.x" workflow* Signed-off-by: github-actions --- .gitattributes | 2 +- .github/workflows/auto-queue.yml | 22 +++++++++++++++++++++ .github/workflows/build.yml | 1 + .gitignore | 2 +- .mergify.yml | 34 -------------------------------- .npmignore | 1 - .projen/files.json | 2 +- package.json | 2 +- yarn.lock | 8 ++++---- 9 files changed, 31 insertions(+), 43 deletions(-) create mode 100644 .github/workflows/auto-queue.yml delete mode 100644 .mergify.yml diff --git a/.gitattributes b/.gitattributes index f139ed5e4e..32ae692203 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,6 +8,7 @@ /.github/ISSUE_TEMPLATE/config.yml linguist-generated /.github/pull_request_template.md linguist-generated /.github/workflows/auto-approve.yml linguist-generated +/.github/workflows/auto-queue.yml linguist-generated /.github/workflows/backport.yml linguist-generated /.github/workflows/build.yml linguist-generated /.github/workflows/pull-request-lint.yml linguist-generated @@ -25,7 +26,6 @@ /.github/workflows/upgrade-runtime-dependencies-1.x.yml linguist-generated /.github/workflows/upgrade-runtime-dependencies-2.x.yml linguist-generated /.gitignore linguist-generated -/.mergify.yml linguist-generated /.npmignore linguist-generated /.projen/** linguist-generated /.projen/deps.json linguist-generated diff --git a/.github/workflows/auto-queue.yml b/.github/workflows/auto-queue.yml new file mode 100644 index 0000000000..cbe749e65d --- /dev/null +++ b/.github/workflows/auto-queue.yml @@ -0,0 +1,22 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". + +name: auto-queue +on: + pull_request_target: + types: + - opened + - reopened + - ready_for_review +jobs: + enableAutoQueue: + name: "Set AutoQueue on PR #${{ github.event.number }}" + runs-on: ubuntu-latest + permissions: + pull-requests: write + contents: write + steps: + - uses: peter-evans/enable-pull-request-automerge@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + pull-request-number: ${{ github.event.number }} + merge-method: squash diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c3d5a9aae..665b835f11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ name: build on: pull_request: {} workflow_dispatch: {} + merge_group: {} jobs: build: runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index f4b07e58cf..70289ad46a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !/.projen/tasks.json !/.projen/deps.json !/.projen/files.json +!/.github/workflows/auto-queue.yml !/.github/workflows/pull-request-lint.yml !/.github/workflows/auto-approve.yml !/package.json @@ -39,7 +40,6 @@ junit.xml /dist/version.txt !/.github/workflows/release.yml !/.github/workflows/release-1.x.yml -!/.mergify.yml !/.github/workflows/upgrade-runtime-dependencies-2.x.yml !/.github/workflows/upgrade-runtime-dependencies-1.x.yml !/.github/pull_request_template.md diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index 4613a14bdf..0000000000 --- a/.mergify.yml +++ /dev/null @@ -1,34 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -queue_rules: - - name: default - update_method: merge - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build - - status-success=package-js - - status-success=package-java - - status-success=package-python - - status-success=package-dotnet - - status-success=package-go - 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: - name: default - conditions: - - "#approved-reviews-by>=1" - - -label~=(do-not-merge) - - status-success=build - - status-success=package-js - - status-success=package-java - - status-success=package-python - - status-success=package-dotnet - - status-success=package-go diff --git a/.npmignore b/.npmignore index 93dd5aa5c8..bf4f7475d4 100644 --- a/.npmignore +++ b/.npmignore @@ -6,7 +6,6 @@ junit.xml permissions-backup.acl /dist/changelog.md /dist/version.txt -/.mergify.yml /test/ /tsconfig.dev.json /src/ diff --git a/.projen/files.json b/.projen/files.json index 7af7f8401e..7c843b89b1 100644 --- a/.projen/files.json +++ b/.projen/files.json @@ -6,6 +6,7 @@ ".github/ISSUE_TEMPLATE/config.yml", ".github/pull_request_template.md", ".github/workflows/auto-approve.yml", + ".github/workflows/auto-queue.yml", ".github/workflows/backport.yml", ".github/workflows/build.yml", ".github/workflows/pull-request-lint.yml", @@ -23,7 +24,6 @@ ".github/workflows/upgrade-runtime-dependencies-1.x.yml", ".github/workflows/upgrade-runtime-dependencies-2.x.yml", ".gitignore", - ".mergify.yml", ".projen/deps.json", ".projen/files.json", ".projen/tasks.json", diff --git a/package.json b/package.json index c1478ae796..ad481a2b02 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "organization": false }, "devDependencies": { - "@cdk8s/projen-common": "^0.0.551", + "@cdk8s/projen-common": "^0.0.552", "@types/follow-redirects": "^1.14.4", "@types/jest": "^27", "@types/node": "16.18.78", diff --git a/yarn.lock b/yarn.lock index 1d16eb416a..0cf20779a4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -294,10 +294,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cdk8s/projen-common@^0.0.551": - version "0.0.551" - resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.551.tgz#13d60ecabba57bf7d2bcb64394a93295871cf919" - integrity sha512-HKedbjgUkZ2STlXxnN/OJOqqyheKg0PULn7Lt+NKb0mBsyViL7PHtmRwi4CuEmsEBpTZXOwpTiwVfIwWCH65Hw== +"@cdk8s/projen-common@^0.0.552": + version "0.0.552" + resolved "https://registry.yarnpkg.com/@cdk8s/projen-common/-/projen-common-0.0.552.tgz#dfbcc33f5d2533626b2f6d1935388cf1cc67b80e" + integrity sha512-rimArjaiiA7CMB/2oIag8NXL+iRjQ5LSVn9ciasuDFdR9dvGBaO30yZSstiJV80r54XYxgJelm9IXQr7dL1KHw== dependencies: codemaker "^1.104.0" deepmerge "^4.3.1"