Skip to content

Commit 51a2d42

Browse files
committed
wip
1 parent ce76a56 commit 51a2d42

File tree

2 files changed

+45
-45
lines changed

2 files changed

+45
-45
lines changed

.github/workflows/codebuild-pr-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ on:
77
branches:
88
- main
99
- v2-release
10-
pull_request: {}
11-
pull_request_target:
10+
pull_request:
1211
branches:
1312
- v2-release
1413
types:
@@ -24,8 +23,8 @@ concurrency:
2423

2524
jobs:
2625
build:
26+
environment: deployment-integ-test
2727
runs-on: codebuild-aws-cdk-github-actions-runner-${{ github.run_id }}-${{ github.run_attempt }}
28-
2928
env:
3029
PR_BUILD: true
3130

@@ -63,6 +62,7 @@ jobs:
6362

6463
- name: Configure system settings
6564
run: |
65+
echo "Hello New change"
6666
(command -v sysctl || sudo apt-get update && sudo apt-get install -y procps) && \
6767
sudo sysctl -w vm.max_map_count=2251954
6868

build.sh

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@ ci="false"
1010
scope=""
1111
concurrency=""
1212
while [[ "${1:-}" != "" ]]; do
13-
case $1 in
14-
-h|--help)
15-
echo "Usage: build.sh [--no-bail] [--force|-f] [--skip-test] [--skip-prereqs] [--skip-compat]"
16-
exit 1
17-
;;
18-
--no-bail)
19-
bail="--no-bail"
20-
;;
21-
-f|--force)
22-
export CDK_BUILD="--force"
23-
;;
24-
--skip-test|--skip-tests)
25-
run_tests="false"
26-
;;
27-
--skip-prereqs)
28-
check_prereqs="false"
29-
;;
30-
--skip-compat)
31-
check_compat="false"
32-
;;
33-
--ci)
34-
ci=true
35-
;;
36-
-c|--concurrency)
37-
concurrency="$2"
38-
shift
39-
;;
40-
*)
41-
echo "Unrecognized parameter: $1"
42-
exit 1
43-
;;
44-
esac
13+
case $1 in
14+
-h | --help)
15+
echo "Usage: build.sh [--no-bail] [--force|-f] [--skip-test] [--skip-prereqs] [--skip-compat]"
16+
exit 1
17+
;;
18+
--no-bail)
19+
bail="--no-bail"
20+
;;
21+
-f | --force)
22+
export CDK_BUILD="--force"
23+
;;
24+
--skip-test | --skip-tests)
25+
run_tests="false"
26+
;;
27+
--skip-prereqs)
28+
check_prereqs="false"
29+
;;
30+
--skip-compat)
31+
check_compat="false"
32+
;;
33+
--ci)
34+
ci=true
35+
;;
36+
-c | --concurrency)
37+
concurrency="$2"
4538
shift
39+
;;
40+
*)
41+
echo "Unrecognized parameter: $1"
42+
exit 1
43+
;;
44+
esac
45+
shift
4646
done
4747

4848
export NODE_OPTIONS="--max-old-space-size=8196 --experimental-worker ${NODE_OPTIONS:-}"
@@ -88,22 +88,22 @@ fi
8888
node ./scripts/check-yarn-lock.js
8989

9090
# Prepare for build with references
91-
/bin/bash scripts/generate-aggregate-tsconfig.sh > tsconfig.json
91+
/bin/bash scripts/generate-aggregate-tsconfig.sh >tsconfig.json
9292

9393
BUILD_INDICATOR=".BUILD_COMPLETED"
9494
rm -rf $BUILD_INDICATOR
9595

9696
if [ "$run_tests" == "true" ]; then
97-
runtarget="$runtarget,test"
97+
runtarget="$runtarget,test"
9898
fi
9999

100100
if [[ "$concurrency" == "" ]]; then
101-
# Auto-limit top-level concurrency to:
102-
# - available CPUs - 1 to limit CPU load
103-
# - total memory / 4GB (N.B: constant here may need to be tweaked, configurable with $CDKBUILD_MEM_PER_PROCESS)
104-
mem_per_process=${CDKBUILD_MEM_PER_PROCESS:-4_000_000_000}
105-
concurrency=$(node -p "Math.max(1, Math.min(require('os').cpus().length - 1, Math.round(require('os').totalmem() / $mem_per_process)))")
106-
echo "Concurrency: $concurrency"
101+
# Auto-limit top-level concurrency to:
102+
# - available CPUs - 1 to limit CPU load
103+
# - total memory / 4GB (N.B: constant here may need to be tweaked, configurable with $CDKBUILD_MEM_PER_PROCESS)
104+
mem_per_process=${CDKBUILD_MEM_PER_PROCESS:-4_000_000_000}
105+
concurrency=$(node -p "Math.max(1, Math.min(require('os').cpus().length - 1, Math.round(require('os').totalmem() / $mem_per_process)))")
106+
echo "Concurrency: $concurrency"
107107
fi
108108

109109
flags=""
@@ -113,7 +113,7 @@ if [ "$ci" == "true" ]; then
113113
fi
114114

115115
echo "============================================================================================="
116-
echo "building..."
116+
echo "building...2"
117117
time npx lerna run $bail --concurrency=$concurrency $runtarget $flags || fail
118118

119119
if [ "$check_compat" == "true" ]; then
@@ -124,7 +124,7 @@ fi
124124
# Skip this step for a "bump candidate" build, where a new, fake version number has been created
125125
# without any corresponding changelog entries.
126126
if ! ${BUMP_CANDIDATE:-false}; then
127-
node ./scripts/create-release-notes.js
127+
node ./scripts/create-release-notes.js
128128
fi
129129

130130
touch $BUILD_INDICATOR

0 commit comments

Comments
 (0)