Skip to content

Commit

Permalink
chore(ci): fix the manifest error on AWS Linux 2 (#13450)
Browse files Browse the repository at this point in the history
Skip the check against `libsimdjson_ffi.so` as it cannot the compiled in AWS Linux 2 due to the old CPP compiler.

KAG-5070
  • Loading branch information
Water-Melon authored Aug 6, 2024
1 parent eec7952 commit db8da59
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion scripts/explain_manifest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ def transform(f: FileInfo):
manifest="fixtures/amazonlinux-2-amd64.txt",
use_rpath=True,
tests={
common_suites: {},
common_suites: {
"skip_libsimdjson_ffi": True,
},
libc_libcpp_suites: {
"libc_max_version": "2.26",
# gcc 7.3.1
Expand Down
9 changes: 5 additions & 4 deletions scripts/explain_manifest/suites.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def read_requirements(path=None):
lines = [re.findall("(.+)=([^# ]+)", d) for d in f.readlines()]
return {l[0][0]: l[0][1].strip() for l in lines if l}

def common_suites(expect, libxcrypt_no_obsolete_api: bool = False):
def common_suites(expect, libxcrypt_no_obsolete_api: bool = False, skip_libsimdjson_ffi: bool = False):
# file existence
expect("/usr/local/kong/include/google/protobuf/**.proto",
"includes Google protobuf headers").exists()
Expand Down Expand Up @@ -82,9 +82,10 @@ def common_suites(expect, libxcrypt_no_obsolete_api: bool = False):
.functions \
.contain("router_execute")

expect("/usr/local/openresty/site/lualib/libsimdjson_ffi.so", "simdjson should have ffi module compiled") \
.functions \
.contain("simdjson_ffi_state_new")
if not skip_libsimdjson_ffi:
expect("/usr/local/openresty/site/lualib/libsimdjson_ffi.so", "simdjson should have ffi module compiled") \
.functions \
.contain("simdjson_ffi_state_new")

if libxcrypt_no_obsolete_api:
expect("/usr/local/openresty/nginx/sbin/nginx", "nginx linked with libxcrypt.so.2") \
Expand Down

1 comment on commit db8da59

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

Bazel Build

Docker image available kong/kong:db8da59a07771c330db66bd621521c3342ab8bd3
Artifacts available https://github.com/Kong/kong/actions/runs/10259468429

Please sign in to comment.