Skip to content

Commit fefe5c7

Browse files
authored
Bump Axios to Fix Velnerabilities + Bump Minimum MacOS version to 10.15 (#617)
1 parent d960eb6 commit fefe5c7

File tree

13 files changed

+63
-152
lines changed

13 files changed

+63
-152
lines changed

codebuild/macos_compatibility_check.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def main():
1010
sys.exit(0)
1111

1212
# Default target macos version setup in script/build.js, set by CMAKE_OSX_DEPLOYMENT_TARGET
13-
supported_version = "10.9"
13+
supported_version = "10.15"
1414
arch = "x64"
1515

1616
if len(sys.argv) > 1:
@@ -22,22 +22,11 @@ def main():
2222
print("uname result {}".format(arch))
2323

2424
lib_path = "dist/bin/darwin-{}-cruntime/aws-crt-nodejs.node".format(arch)
25-
2625
if re.match(r'^(aarch64|armv[6-8]|arm64)', arch): # on arm
2726
# The oldest version we can target on arm64 is 11.0
2827
supported_version = "11.0"
29-
# The script used "otool" to grab the version of the library. "otool" provides different formats on arm and x64
30-
# on arm: we search for "minos"
31-
# on x64: The format will be:
32-
# Load command 8
33-
# cmd LC_VERSION_MIN_MACOSX
34-
# cmdsize 16
35-
# version 10.9
36-
# sdk 12.1
37-
# Load command 9
38-
otool_cmd = "otool -l {} | grep -E minos | tr -s ' ' | cut -f3 -d' ' | tr -d ' ' | tr -d '[:space:]'".format(lib_path)
39-
else: # on x86_64
40-
otool_cmd = "otool -l {} | grep -A3 \'LC_VERSION_MIN_MACOSX\' | grep -E version | tr -s ' ' | cut -f3 -d' ' | tr -d '[:space:]'".format(lib_path)
28+
29+
otool_cmd = "otool -l {} | grep -A5 -E 'LC_VERSION_MIN_MACOSX|LC_BUILD_VERSION' | grep -E '(version|minos)' | head -1 | tr -s ' ' | cut -f3 -d' ' | tr -d '[:space:]'".format(lib_path)
4130

4231
print("Start to validate the build binary for MacOS with architecture {}, expected min os version: {}".format(arch,supported_version))
4332
result = subprocess.check_output(otool_cmd, shell=True).decode("utf-8")

crt/aws-c-http

crt/aws-c-io

Submodule aws-c-io updated 53 files

crt/aws-lc

crt/s2n

Submodule s2n updated from 21cefc1 to 1c5798b

0 commit comments

Comments
 (0)