Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ jobs:
# Upgrade all the packages
lerna exec --parallel ncu -- --upgrade --filter=jsii,jsii-rosetta,typescript --target=patch
lerna exec --parallel ncu -- --upgrade --reject='@aws-cdk/asset-awscli-v1,@types/conventional-commits-parser,@types/node,@types/prettier,constructs,jsii,jsii-rosetta,typescript,aws-sdk-mock,@aws-sdk/*,@aws-cdk/aws-service-spec,@aws-cdk/service-spec-types,${{ steps.list-packages.outputs.list }}' --target=minor
# Upgrade package.json files in init templates
for pj in $(find packages/aws-cdk/lib/init-templates -name package.json); do
(cd $(dirname $pj) && ncu --upgrade --reject='constructs,${{ steps.list-packages.outputs.list }}')
done
# Upgrade dependencies at an aws-eks integ test docker image
cd packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/sdk-call-integ-test-docker-app/app/ && ncu --upgrade --reject='@aws-sdk/*,${{ steps.list-packages.outputs.list }}'

Expand Down Expand Up @@ -103,7 +99,8 @@ jobs:
path: ${{ runner.temp }}

- name: Apply patch
run: '[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp
run:
'[ -s ${{ runner.temp }}/upgrade.patch ] && git apply ${{ runner.temp
}}/upgrade.patch || echo "Empty patch. Skipping."'

- name: Make Pull Request
Expand All @@ -116,7 +113,7 @@ jobs:
chore: npm-check-updates && yarn upgrade
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
# Pull Request details
title: 'chore: npm-check-updates && yarn upgrade'
title: "chore: npm-check-updates && yarn upgrade"
body: |-
Ran npm-check-updates and yarn upgrade to keep the `yarn.lock` file up-to-date.
labels: contribution/core,dependencies,auto-approve
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
"compat": "./scripts/check-api-compatibility.sh",
"bump": "./bump.sh",
"build-all": "tsc -b",
"atmosphere-integ-test": "lerna run build --scope @aws-cdk/integration-test-deployment && node tools/@aws-cdk/integration-test-deployment/bin/index.js"
"atmosphere-integ-test": "lerna run build --scope @aws-cdk/integration-test-deployment && node tools/@aws-cdk/integration-test-deployment/bin/index.js",
"rosetta": "jsii-rosetta",
"synthetic-examples": "cdk-generate-synthetic-examples"
},
"devDependencies": {
"@nx/workspace": "^20",
"@types/node": "18.19.129",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^2.4.5",
"cdk-generate-synthetic-examples": "^0.2.32",
"cdk-generate-synthetic-examples": "^0.2.36",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
Expand Down
4 changes: 2 additions & 2 deletions scripts/run-rosetta.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
set -eu
scriptdir=$(cd $(dirname $0) && pwd)

ROSETTA=${ROSETTA:-npx jsii-rosetta}
ROSETTA=${ROSETTA:-yarn run rosetta}

infuse=false
jsii_pkgs_file=""
Expand Down Expand Up @@ -73,7 +73,7 @@ time $ROSETTA extract \

if $infuse; then
echo "💎 Generating synthetic examples for the remainder" >&2
time npx cdk-generate-synthetic-examples@latest \
time yarn run synthetic-examples \
$(cat $jsii_pkgs_file)

time $ROSETTA extract \
Expand Down
66 changes: 33 additions & 33 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3667,14 +3667,6 @@
chalk "^4.1.2"
semver "^7.7.2"

"@jsii/[email protected]":
version "1.115.0"
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.115.0.tgz#ac6c67d27ab484d0625e44592bb201514ed9d7b9"
integrity sha512-DEcg6DWa7UFgPipR0FqnqWBd9d/zzmTW6fJSUORFhh1USYjYofyCNc76IXxBDdd8gMQYMnvuQ1GTjygLcRjlRA==
dependencies:
chalk "^4.1.2"
semver "^7.7.2"

"@jsii/[email protected]":
version "1.118.0"
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.118.0.tgz#0be4fef43c7058764e3b4d146c6fbc80306de6bd"
Expand All @@ -3691,20 +3683,21 @@
chalk "^4.1.2"
semver "^7.7.2"

"@jsii/[email protected]":
version "1.120.0"
resolved "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.120.0.tgz#f451a16ef45cb5033727b42391b3b3231d30cea0"
integrity sha512-seQxZ+r3PxHCRBwLZz8F9FjjVAyDtXW2tdsHAp1gITPNehfc650vKu0gk5fCtCo85NA+Fv38ysNqimHCfa8A+Q==
dependencies:
chalk "^4.1.2"
semver "^7.7.2"

"@jsii/[email protected]":
version "1.114.1"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.114.1.tgz#9c064d57f062d913bcfda25b5496bdf4c9c95c46"
integrity sha512-SdjVQaNqLkTUK+2R0/t/MnM/NBvv1vzqxO5sn1nnoFD5Wlih8TFOIjl+Q8npzYmOtN+et3D+BMVYrxmVfq4X0w==
dependencies:
ajv "^8.17.1"

"@jsii/[email protected]", "@jsii/spec@^1.115.0":
version "1.115.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.115.0.tgz#be0818bd31509687cb6445873d1ec65e8d24bd24"
integrity sha512-qnicuByM0G5L6ZF2yO/e5cHwT6pb5E0aUvgHBycFPHBkgf5yjtvm+Wtk6q61srNuRASYI25BiTOonyABNeRjlw==
dependencies:
ajv "^8.17.1"

"@jsii/[email protected]":
version "1.118.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.118.0.tgz#66d6da3089e002ee3ee89dcc6e9d284a039acf94"
Expand All @@ -3719,6 +3712,13 @@
dependencies:
ajv "^8.17.1"

"@jsii/[email protected]", "@jsii/spec@^1.120.0":
version "1.120.0"
resolved "https://registry.npmjs.org/@jsii/spec/-/spec-1.120.0.tgz#fc0fe02e3cd946ca45698c7b9ddb382e31cab89c"
integrity sha512-BurJOykpQNhqR80h6/RXX5i8rEO574KUP5BfiKApe+RAsEevCdfF7+Ev5ekrUgMfxxfvaQZyNEY640hXPQgq1w==
dependencies:
ajv "^8.17.1"

"@lerna/[email protected]":
version "8.2.4"
resolved "https://registry.npmjs.org/@lerna/create/-/create-8.2.4.tgz#59a050f58681e9236db38cc5bcc6986ae79d1389"
Expand Down Expand Up @@ -6607,13 +6607,13 @@ [email protected], case@^1.6.3:
resolved "https://registry.npmjs.org/case/-/case-1.6.3.tgz#0a4386e3e9825351ca2e6216c60467ff5f1ea1c9"
integrity sha512-mzDSXIPaFwVDvZAHqZ9VlbyF4yyXRuX6IvB06WvPYkqJVO24kX1PPhv9bfpKNFZyxYFmmgo03HUiD8iklmJYRQ==

cdk-generate-synthetic-examples@^0.2.32:
version "0.2.32"
resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.32.tgz#e79900e3b1f6ecc7fdb5141086561eb847fd9184"
integrity sha512-Uj7s8dHNv2xUM3E9iLMeSaNwWp1oJ3PmW3fZQ3wlyhUoAielOJP2eH3aMsY81FNy7vJa5KxvGZjWHi101stuWQ==
cdk-generate-synthetic-examples@^0.2.36:
version "0.2.36"
resolved "https://registry.npmjs.org/cdk-generate-synthetic-examples/-/cdk-generate-synthetic-examples-0.2.36.tgz#eadf34cd497552fbcc3acc4c356e3f17506c5808"
integrity sha512-rybNIxro8Z2i6HPy7Zea/STbnnyR5gMQlKeuQ/Bx1ZB6XdPlN11YuL79RXG59Bc/JDMJCxDhQdyQWbkte24+Nw==
dependencies:
"@jsii/spec" "^1.115.0"
jsii-reflect "^1.115.0"
"@jsii/spec" "^1.120.0"
jsii-reflect "^1.120.0"
yargs "^17.7.2"

[email protected]:
Expand Down Expand Up @@ -10325,16 +10325,16 @@ [email protected], jsii-reflect@^1.119.0:
oo-ascii-tree "^1.119.0"
yargs "^17.7.2"

jsii-reflect@^1.115.0:
version "1.115.0"
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.115.0.tgz#debe523fa2de0ba020d54d41a2f7b0e0bc8ef048"
integrity sha512-svWvulZ8IH035sLR0aEt3UiN4Ejqh99zSBfVTFsr3bjBfDZqcxIlExFI/fMb7O+a7XwT0WdTakTuX/aajQt3cg==
jsii-reflect@^1.120.0:
version "1.120.0"
resolved "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.120.0.tgz#9e20890f0ffe6315d27fb39c923ed6f34b016331"
integrity sha512-gmQNRwdsCP+hqW+vijOVbh/TdleFo1+QUqsEXXr+kERWKa0qxWHaLb+saVUkeUSl4sLQbAYDPTSMi5s4M9T2qA==
dependencies:
"@jsii/check-node" "1.115.0"
"@jsii/spec" "1.115.0"
"@jsii/check-node" "1.120.0"
"@jsii/spec" "1.120.0"
chalk "^4"
fs-extra "^10.1.0"
oo-ascii-tree "^1.115.0"
oo-ascii-tree "^1.120.0"
yargs "^17.7.2"

jsii-rosetta@~5.9.14:
Expand Down Expand Up @@ -11961,16 +11961,16 @@ onetime@^5.1.0, onetime@^5.1.2:
dependencies:
mimic-fn "^2.1.0"

oo-ascii-tree@^1.115.0:
version "1.115.0"
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.115.0.tgz#60a28f29cc449cd4274140f5d939c08a18c5ac8b"
integrity sha512-KbZpipKiCQ5Ws2GryfOUWBxuVpVYosqAi85mtplgMyhQuueOZAO8qeTmNqYYHUxBHOz9O+kKCCjidEkLmCDhLQ==

oo-ascii-tree@^1.119.0:
version "1.119.0"
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.119.0.tgz#642c9906bc93e419917bfaf4f8ed1559773d8125"
integrity sha512-4Aj3mBl0nM/YsUWEoUGPtO8gQ/tUJqaLyTGV63vag1plJuQuJShWHKEXcS0k8r70EDoOcx3q3Dql0U6YuMW2kw==

oo-ascii-tree@^1.120.0:
version "1.120.0"
resolved "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.120.0.tgz#87d8abd43e84efb5a23827277ef40ed64f1aa2fe"
integrity sha512-8aZZbPwoizq9fGRcn7MkCmYdZ2G4RSA/k2s8OlF4ijbbGFzxhG2jt4xVw4uRPpt9aLOgU051h/t0LePFBVppsQ==

open@^8.4.0:
version "8.4.2"
resolved "https://registry.npmjs.org/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
Expand Down
Loading