Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cdk init template for .NET, and re-enable .NET targets #617

Merged
merged 16 commits into from
Sep 11, 2018
Merged
Show file tree
Hide file tree
Changes from 8 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
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ trap "rm -rf $MERKLE_BUILD_CACHE" EXIT

echo "============================================================================================="
echo "building..."
time lerna exec --stream "npm run build"
time lerna --concurrency 1 exec --stream "npm run build"

echo "============================================================================================="
echo "testing..."
lerna run --stream test
lerna --concurrency 1 run --stream test

touch $BUILD_INDICATOR
6 changes: 3 additions & 3 deletions bump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ if [ -z "${ver}" ]; then
exit 1
fi

lerna publish --force-publish=* --skip-npm --skip-git --repo-version ${ver}
lerna run build
lerna --concurrency 1 publish --force-publish=* --skip-npm --skip-git --repo-version ${ver}
lerna --concurrency 1 run build

# update test expectations
UPDATE_DIFF=1 lerna run test
UPDATE_DIFF=1 lerna --concurrency 1 run test

4 changes: 2 additions & 2 deletions bundle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
set -euo pipefail
root=$PWD

# Get version from lerna
version="$(cat ${root}/lerna.json | grep version | cut -d '"' -f4)"
# Get version from lerna --concurrency 1
version="$(cat ${root}/lerna --concurrency 1.json | grep version | cut -d '"' -f4)"

# Get commit from CodePipeline (or git, if we are in CodeBuild)
# If CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local
Expand Down
8 changes: 4 additions & 4 deletions create-missing-libraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail
export PATH=node_modules/.bin:$PATH

# Making sure the bare minimum packages allowing be able to test-build the generated packages is available:
lerna exec --scope=cfn2ts \
lerna --concurrency 1 exec --scope=cfn2ts \
--scope=pkglint \
--scope=@aws-cdk/cdk \
--scope=@aws-cdk/assert \
Expand All @@ -14,7 +14,7 @@ lerna exec --scope=cfn2ts \
--stream \
npm run build

VERSION=$(node -e 'console.log(require("./lerna.json").version);')
VERSION=$(node -e 'console.log(require("./lerna --concurrency 1.json").version);')

for S in $(node -e 'console.log(require("./packages/@aws-cdk/cfnspec").namespaces.join("\n"));'); do
P=$(tr 'A-Z' 'a-z' <<< "${S/AWS::/@aws-cdk/aws-}")
Expand Down Expand Up @@ -147,8 +147,8 @@ EOM
cp LICENSE NOTICE packages/${P}/

echo "⌛️ Bootstrapping & building ${P}"
lerna bootstrap --scope=${P}
lerna run build --scope=${P}
lerna --concurrency 1 bootstrap --scope=${P}
lerna --concurrency 1 run build --scope=${P}

git add packages/${P}

Expand Down
4 changes: 2 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ echo "==========================================================================
echo "installing repo-global dependencies..."
npm i --no-package-lock --global-style

# Now that we have lerna available...
# Now that we have lerna --concurrency 1 available...
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a find and replace but the comment here shouldn't of changed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

export PATH=node_modules/.bin:$PATH

echo "============================================================================================="
echo "bootstrapping..."
lerna bootstrap --reject-cycles
lerna --concurrency 1 bootstrap --reject-cycles
4 changes: 2 additions & 2 deletions pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ packdir="$PWD/pack"
rm -fr ${packdir}
mkdir -p ${packdir}

scopes=$(lerna ls 2>/dev/null | grep -v "(private)" | cut -d" " -f1 | xargs -n1 -I{} echo "--scope {}" | tr "\n" " ")
scopes=$(lerna --concurrency 1 ls 2>/dev/null | grep -v "(private)" | cut -d" " -f1 | xargs -n1 -I{} echo "--scope {}" | tr "\n" " ")

# Run the "cdk-package" script in all modules. For jsii modules, this invokes jsii-pacmak which generates and builds multi-language
# outputs. For non-jsii module, it will just run "npm pack" and place the output in dist/npm (which is similar to how pacmak outputs it).
lerna run ${scopes} --sort --stream package
lerna --concurrency 1 run ${scopes} --sort --stream package

# Collect dist/ from all modules into the root dist/
/bin/bash ./pack-collect.sh
6 changes: 5 additions & 1 deletion packages/@aws-cdk/assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cdk-assets"
}
},
"dotnet": {
"namespace": "Amazon.CDK.Assets",
"packageId": "Amazon.CDK.Assets"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -56,4 +60,4 @@
"@aws-cdk/cx-api": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your editor has stripped new line at end of file on a few files making the diff larger than needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-apigateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "apigateway"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.APIGateway",
"packageId": "Amazon.CDK.AWS.APIGateway"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-applicationautoscaling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "applicationautoscaling"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.ApplicationAutoScaling",
"packageId": "Amazon.CDK.AWS.ApplicationAutoScaling"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-appsync/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "appsync"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AppSync",
"packageId": "Amazon.CDK.AWS.AppSync"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-athena/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "athena"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Athena",
"packageId": "Amazon.CDK.AWS.Athena"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-autoscaling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "autoscaling"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AutoScaling",
"packageId": "Amazon.CDK.AWS.AutoScaling"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -59,4 +63,4 @@
"@aws-cdk/aws-sns": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-autoscalingplans/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "autoscalingplans"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.AutoScalingPlans",
"packageId": "Amazon.CDK.AWS.AutoScalingPlans"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-batch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "batch"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Batch",
"packageId": "Amazon.CDK.AWS.Batch"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-budgets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "budgets"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Budgets",
"packageId": "Amazon.CDK.AWS.Budgets"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-certificatemanager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "certificatemanager"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CertificateManager",
"packageId": "Amazon.CDK.AWS.CertificateManager"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -56,4 +60,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-cloud9/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cloud9"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.Cloud9",
"packageId": "Amazon.CDK.AWS.Cloud9"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -55,4 +59,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-cloudformation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cloudformation"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudFormation",
"packageId": "Amazon.CDK.AWS.CloudFormation"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -64,4 +68,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-cloudfront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cloudfront"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudFront",
"packageId": "Amazon.CDK.AWS.CloudFront"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -61,4 +65,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-cloudtrail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cloudtrail"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudTrail",
"packageId": "Amazon.CDK.AWS.CloudTrail"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -60,4 +64,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-cloudwatch/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "cloudwatch"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CloudWatch",
"packageId": "Amazon.CDK.AWS.CloudWatch"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -57,4 +61,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-codebuild/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "codebuild"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodeBuild",
"packageId": "Amazon.CDK.AWS.CodeBuild"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -68,4 +72,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
6 changes: 5 additions & 1 deletion packages/@aws-cdk/aws-codecommit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"artifactId": "codecommit"
}
},
"dotnet": {
"namespace": "Amazon.CDK.AWS.CodeCommit",
"packageId": "Amazon.CDK.AWS.CodeCommit"
},
"sphinx": {}
}
},
Expand Down Expand Up @@ -65,4 +69,4 @@
"@aws-cdk/cdk": "^0.8.2"
},
"homepage": "https://github.com/awslabs/aws-cdk"
}
}
Loading