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
17 changes: 4 additions & 13 deletions .github/workflows/build-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
run: |
# Create a temporary directory for build logs
mkdir -p /tmp/build_logs
npm install -g eslint > /dev/null

yarn global add eslint@latest
yarn global add aws-cdk@latest
# Function to build a single file
build_file() {
echo "Build File $1"
Expand All @@ -70,17 +70,16 @@ jobs:

if [ $exit_code -eq 0 ]; then
echo "✅ Build succeeded for $file"

# Clean up node_modules and cdk.out for this project immediately after successful build
echo "Cleaning up build artifacts for $(dirname "$file")"
local project_dir=$(dirname "$file")

# Remove node_modules directory if it exists
if [ -d "$project_dir/node_modules" ]; then
echo "Removing $project_dir/node_modules"
rm -rf "$project_dir/node_modules"
fi

# Remove cdk.out directory if it exists
if [ -d "$project_dir/cdk.out" ]; then
echo "Removing $project_dir/cdk.out"
Expand Down Expand Up @@ -129,13 +128,6 @@ jobs:
# Change to language directory
cd ./${{ matrix.language }}

# install CDK CLI from npm if not typescript, so that npx can find it later
# ts will use the one from the particular cdk app
if [[ ${{ matrix.language }} != 'typescript' ]]; then
npm install -g aws-cdk
npx cdk --version
fi

# Run the build_file function in parallel for each project to be built
# Halt the execution if any of the build_file invocations fail
echo "::group::Build Output"
Expand All @@ -145,7 +137,6 @@ jobs:

# Check the exit status of parallel
parallel_exit=$?

# If parallel failed, make sure the workflow fails too
if [ $parallel_exit -ne 0 ]; then
echo "::error::One or more builds failed. See build output above for details."
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-typescript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
# Check if yarn.lock exists
if [ -f "yarn.lock" ]; then
echo "yarn.lock file found. Running 'yarn install'..."
yarn install --frozen-lockfile
yarn install --frozen-lockfile --mutex network
yarn build
npm run --if-present test
# Check if package-lock.json exists
Expand Down
2 changes: 1 addition & 1 deletion scripts/synth.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if $fake_context; then
cp $scriptdir/fake.context.json cdk.context.json
fi

yarn global add cdk@latest
# yarn global add cdk@latest # > Should not need anymore.
cdk synth

if $fake_context; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ describe('Snapshot', () => {
const app = new App();
const stack = new GatewayLambdaAuth(app, 'test-api-gateway-lambda-auth');
const template = Template.fromStack(stack);

// Normalize the template before snapshot comparison
const normalizedTemplate = normalizeTemplate(template.toJSON());
expect(normalizedTemplate).toMatchSnapshot();
Expand Down
12 changes: 6 additions & 6 deletions typescript/connect-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"cdk": "cdk"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/node": "20.14.9",
"aws-cdk": "2.157.0",
"@types/jest": "^29.5.14",
"@types/node": "22.7.9",
"aws-cdk": "2.1004.0",
"jest": "^29.7.0",
"ts-jest": "^29.1.5",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "~5.5.3"
"typescript": "~5.6.3"
},
"dependencies": {
"aws-cdk-lib": "2.157.0",
"aws-cdk-lib": "2.185.0",
"cdk-nag": "^2.30.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.21"
Expand Down
8 changes: 4 additions & 4 deletions typescript/custom-logical-names/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"cdk": "cdk"
},
"devDependencies": {
"aws-cdk": "*",
"ts-node": "^8.1.0",
"typescript": "~5.1.6"
"aws-cdk": "2.1004.0",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
"dependencies": {
"aws-cdk-lib": "^2.0.0",
"aws-cdk-lib": "2.185.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.9"
}
Expand Down
16 changes: 8 additions & 8 deletions typescript/custom-resource-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
},
"devDependencies": {
"@aws-cdk/assert": "*",
"@types/jest": "^26.0.10",
"@types/node": "10.17.27",
"jest": "^26.4.2",
"ts-jest": "^29.1.1",
"aws-cdk": "*",
"ts-node": "^10.9.1",
"typescript": "~5.1.6"
"@types/jest": "^29.5.14",
"@types/node": "22.7.9",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"aws-cdk": "2.1004.0",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
"dependencies": {
"aws-cdk-lib": "^2.0.0",
"aws-cdk-lib": "2.185.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.16"
}
Expand Down
8 changes: 4 additions & 4 deletions typescript/custom-resource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
},
"license": "Apache-2.0",
"devDependencies": {
"@types/node": "^10.17.0",
"aws-cdk": "*",
"typescript": "~5.1.6"
"@types/node": "22.7.9",
"aws-cdk": "2.1004.0",
"typescript": "~5.6.3"
},
"dependencies": {
"aws-cdk-lib": "^2.0.0",
"aws-cdk-lib": "2.185.0",
"constructs": "^10.0.0"
}
}
10 changes: 5 additions & 5 deletions typescript/ddb-stream-lambda-sns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
},
"devDependencies": {
"@types/jest": "^29.5.14",
"@types/node": "22.9.0",
"aws-cdk": "2.166.0",
"@types/node": "22.7.9",
"aws-cdk": "2.1004.0",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
"dependencies": {
"@aws-solutions-constructs/aws-dynamodbstreams-lambda": "^2.74.0",
"aws-cdk-lib": "2.167.0",
"constructs": "^10.4.2"
"aws-cdk-lib": "2.185.0",
"constructs": "^10.0.0"
}
}
}
16 changes: 8 additions & 8 deletions typescript/ddb/global-table-with-cmk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"cdk": "cdk"
},
"devDependencies": {
"@types/jest": "^26.0.10",
"@types/node": "10.17.27",
"aws-cdk": "2.80.0",
"jest": "^26.4.2",
"ts-jest": "^26.2.0",
"ts-node": "^9.0.0",
"typescript": "~5.1.6"
"@types/jest": "^29.5.14",
"@types/node": "22.7.9",
"aws-cdk": "2.1004.0",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "~5.6.3"
},
"dependencies": {
"aws-cdk-lib": "2.80.0",
"aws-cdk-lib": "2.185.0",
"constructs": "^10.0.0",
"source-map-support": "^0.5.16"
}
Expand Down
24 changes: 0 additions & 24 deletions typescript/ec2-instance-connect-endpoint/.gitattributes

This file was deleted.

This file was deleted.

110 changes: 0 additions & 110 deletions typescript/ec2-instance-connect-endpoint/.github/workflows/build.yml

This file was deleted.

This file was deleted.

Loading
Loading