Skip to content

Commit

Permalink
chore(ci): skip ada compilation in amazon-linux-2
Browse files Browse the repository at this point in the history
  • Loading branch information
Water-Melon committed Sep 6, 2024
1 parent b861d1f commit 88b9995
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/matrix-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ build-packages:
package: rpm
package-type: aws2
check-manifest-suite: amazonlinux-2-amd64
# simdjson doesn't compile on gcc7.3.1 (needs 7.4)
bazel-args: --platforms=//:aws2-crossbuild-x86_64 --//:simdjson=False
# ada and simdjson don't compile on gcc7.3.1 (needs 7.4)
bazel-args: --platforms=//:aws2-crossbuild-x86_64 --//:simdjson=False --//:additional_deps=False
- label: amazonlinux-2023
image: amazonlinux:2023
package: rpm
Expand Down
14 changes: 14 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,20 @@ config_setting(
visibility = ["//visibility:public"],
)

# --//:addition_deps=true
bool_flag(
name = "additional_deps",
build_setting_default = True,
)

config_setting(
name = "additional_deps_flag",
flag_values = {
":additional_deps": "true",
},
visibility = ["//visibility:public"],
)

# --//:licensing=false
bool_flag(
name = "licensing",
Expand Down
13 changes: 8 additions & 5 deletions build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ clib_deps = [
"@openssl",
"@libexpat",
"@snappy",
]

additional_deps = [
"@ada",
]

Expand All @@ -23,15 +26,15 @@ clib_deps = [
prefix = "kong/lib" if k in ("@passwdqc", "@snappy", "@ada") else "kong",
strip_path = "snappy" if k == "@snappy" else "ada" if k == "@ada" else "",
)
for k in clib_deps
for k in clib_deps + additional_deps
]

kong_rules_group(
name = "install-clibs",
propagates = [
":install-%s" % get_workspace_name(k)
for k in clib_deps
],
propagates = select({
"@kong//:additional_deps_flag": [":install-%s" % get_workspace_name(k) for k in clib_deps + additional_deps],
"//conditions:default": [":install-%s" % get_workspace_name(k) for k in clib_deps],
}),
visibility = ["//visibility:public"],
)

Expand Down
7 changes: 0 additions & 7 deletions scripts/explain_manifest/fixtures/amazonlinux-2-amd64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@
- libc.so.6
Rpath : /usr/local/kong/lib

- Path : /usr/local/kong/lib/libada.so
Needed :
- libstdc++.so.6
- libm.so.6
- libgcc_s.so.1
- libc.so.6

- Path : /usr/local/kong/lib/libcrypto.so.3
Needed :
- libm.so.6
Expand Down
3 changes: 2 additions & 1 deletion scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@

- Path : /usr/local/kong/lib/libada.so
Needed :
- libstdc++.so.6
- libm.so.6
- libstdc++.so.6
- libgcc_s.so.1
- libc.so.6
- ld-linux-aarch64.so.1

- Path : /usr/local/kong/lib/libcrypto.so.3
Needed :
Expand Down
3 changes: 2 additions & 1 deletion scripts/explain_manifest/fixtures/el9-arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,11 @@

- Path : /usr/local/kong/lib/libada.so
Needed :
- libstdc++.so.6
- libm.so.6
- libstdc++.so.6
- libgcc_s.so.1
- libc.so.6
- ld-linux-aarch64.so.1

- Path : /usr/local/kong/lib/libcrypto.so.3
Needed :
Expand Down
2 changes: 1 addition & 1 deletion scripts/explain_manifest/fixtures/ubuntu-22.04-arm64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
- Path : /usr/local/kong/lib/libada.so
Needed :
- libstdc++.so.6
- libm.so.6
- libgcc_s.so.1
- libc.so.6
- ld-linux-aarch64.so.1

- Path : /usr/local/kong/lib/libcrypto.so.3
Needed :
Expand Down

0 comments on commit 88b9995

Please sign in to comment.