Skip to content

Commit 58ad419

Browse files
authored
Merge branch 'main' into sennatb-chore-log-group
2 parents 6b1d7e0 + 992b0a5 commit 58ad419

File tree

126 files changed

+13567
-1916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+13567
-1916
lines changed
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Codebuild PR Build
2+
3+
on:
4+
workflow_dispatch: {}
5+
merge_group: {}
6+
push:
7+
branches:
8+
- main
9+
- v2-release
10+
pull_request:
11+
branches:
12+
- main
13+
- v2-release
14+
15+
# For every PR, cancel any previous builds in progress
16+
# ... but for all other builds we keep them running
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.run_id }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
build:
23+
runs-on: codebuild-aws-cdk-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }}
24+
25+
env:
26+
PR_BUILD: true
27+
28+
steps:
29+
- name: Checkout code
30+
uses: actions/checkout@v4
31+
32+
- name: Setup Node.js
33+
uses: actions/setup-node@v4
34+
with:
35+
node-version: "18"
36+
cache: "yarn"
37+
38+
- name: Set up Docker
39+
uses: docker/setup-buildx-action@v3
40+
41+
- name: Load Docker images
42+
id: docker-cache
43+
uses: actions/cache/restore@v4
44+
with:
45+
path: |
46+
~/.docker-images.tar
47+
key: docker-cache-${{ runner.os }}
48+
49+
- name: Restore Docker images
50+
if: ${{ steps.docker-cache.outputs.cache-hit }}
51+
run: docker image load --input ~/.docker-images.tar
52+
53+
- name: Cache build artifacts
54+
uses: actions/cache@v4
55+
with:
56+
path: |
57+
~/.s3buildcache
58+
key: s3buildcache-${{ runner.os }}
59+
60+
- name: Configure system settings
61+
run: |
62+
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
63+
sudo sysctl -w vm.max_map_count=2251954
64+
65+
- name: Build
66+
run: /bin/bash ./build.sh --ci
67+
68+
- name: Run Rosetta
69+
run: /bin/bash ./scripts/run-rosetta.sh
70+
71+
- name: Check for uncommitted changes
72+
run: git diff-index --exit-code --ignore-space-at-eol --stat HEAD
73+
74+
- name: Export Docker images
75+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
76+
run: docker image save --output ~/.docker-images.tar $(docker image list --format '{{ if ne .Repository "<none>" }}{{ .Repository }}{{ if ne .Tag "<none>" }}:{{ .Tag }}{{ end }}{{ else }}{{ .ID }}{{ end }}')
77+
78+
- name: Cache Docker images
79+
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
80+
uses: actions/cache/save@v4
81+
with:
82+
path: |
83+
~/.docker-images.tar
84+
key: docker-cache-${{ runner.os }}

deprecated_apis.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ aws-cdk-lib.aws_cloudwatch.IMetric#toAlarmConfig
418418
aws-cdk-lib.aws_cloudwatch.IMetric#toGraphConfig
419419
aws-cdk-lib.aws_cloudwatch.MathExpression#toAlarmConfig
420420
aws-cdk-lib.aws_cloudwatch.MathExpression#toGraphConfig
421+
aws-cdk-lib.aws_cloudwatch.SearchExpression#toAlarmConfig
422+
aws-cdk-lib.aws_cloudwatch.SearchExpression#toGraphConfig
421423
aws-cdk-lib.aws_cloudwatch.Metric#toAlarmConfig
422424
aws-cdk-lib.aws_cloudwatch.Metric#toGraphConfig
423425
aws-cdk-lib.aws_cloudwatch.MetricAlarmConfig

packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.assets.json

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/aws-cdk-asg-integ.template.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,47 @@
11031103
"IgnoreUnmodifiedGroupSizeProperties": true
11041104
}
11051105
}
1106+
},
1107+
"AsgFromMigrationToLTASGDEC25774": {
1108+
"Type": "AWS::AutoScaling::AutoScalingGroup",
1109+
"Properties": {
1110+
"LaunchTemplate": {
1111+
"LaunchTemplateId": {
1112+
"Ref": "MainLT4FC09097"
1113+
},
1114+
"Version": {
1115+
"Fn::GetAtt": [
1116+
"MainLT4FC09097",
1117+
"LatestVersionNumber"
1118+
]
1119+
}
1120+
},
1121+
"MaxSize": "1",
1122+
"MinSize": "1",
1123+
"VPCZoneIdentifier": [
1124+
{
1125+
"Ref": "VPCPrivateSubnet1Subnet8BCA10E0"
1126+
},
1127+
{
1128+
"Ref": "VPCPrivateSubnet2SubnetCFCDAA7A"
1129+
}
1130+
]
1131+
},
1132+
"UpdatePolicy": {
1133+
"AutoScalingRollingUpdate": {
1134+
"SuspendProcesses": [
1135+
"HealthCheck",
1136+
"ReplaceUnhealthy",
1137+
"AZRebalance",
1138+
"AlarmNotification",
1139+
"ScheduledActions",
1140+
"InstanceRefresh"
1141+
]
1142+
},
1143+
"AutoScalingScheduledAction": {
1144+
"IgnoreUnmodifiedGroupSizeProperties": true
1145+
}
1146+
}
11061147
}
11071148
},
11081149
"Parameters": {

packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/cdk.out

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-lt.js.snapshot/integ.json

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)