From 96076c31706f4dde362883b9e6df58002dc84c41 Mon Sep 17 00:00:00 2001 From: Wangchong Zhou Date: Tue, 10 Dec 2024 12:51:02 +0800 Subject: [PATCH] Revert "chore(cd): remove ubuntu-20.04" This reverts commit 9251dc791655790510fa7f3dbedd05cb62147311. --- .github/matrix-full.yml | 10 + scripts/explain_manifest/config.py | 13 ++ .../fixtures/ubuntu-20.04-amd64.txt | 204 ++++++++++++++++++ 3 files changed, 227 insertions(+) create mode 100644 scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt diff --git a/.github/matrix-full.yml b/.github/matrix-full.yml index 97f4b1bca6b8..4c8ae1fb6a45 100644 --- a/.github/matrix-full.yml +++ b/.github/matrix-full.yml @@ -7,6 +7,10 @@ build-packages: # check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py # Ubuntu +- label: ubuntu-20.04 + image: ubuntu:20.04 + package: deb + check-manifest-suite: ubuntu-20.04-amd64 - label: ubuntu-22.04 image: ubuntu:22.04 package: deb @@ -116,6 +120,12 @@ scan-vulnerabilities: release-packages: # Ubuntu +- label: ubuntu-20.04 + package: deb + artifact-from: ubuntu-20.04 + artifact-version: 20.04 + artifact-type: ubuntu + artifact: kong.amd64.deb - label: ubuntu-22.04 package: deb artifact-from: ubuntu-22.04 diff --git a/scripts/explain_manifest/config.py b/scripts/explain_manifest/config.py index 2250cac8c578..04e19f4830ed 100644 --- a/scripts/explain_manifest/config.py +++ b/scripts/explain_manifest/config.py @@ -99,6 +99,19 @@ def transform(f: FileInfo): }, } ), + "ubuntu-20.04-amd64": ExpectSuite( + name="Ubuntu 20.04 (amd64)", + manifest="fixtures/ubuntu-20.04-amd64.txt", + tests={ + common_suites: {}, + libc_libcpp_suites: { + "libc_max_version": "2.30", + # gcc 9.3.0 + "libcxx_max_version": "3.4.28", + "cxxabi_max_version": "1.3.12", + }, + } + ), "ubuntu-22.04-amd64": ExpectSuite( name="Ubuntu 22.04 (amd64)", manifest="fixtures/ubuntu-22.04-amd64.txt", diff --git a/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt new file mode 100644 index 000000000000..ced909d9fcb8 --- /dev/null +++ b/scripts/explain_manifest/fixtures/ubuntu-20.04-amd64.txt @@ -0,0 +1,204 @@ +- Path : /etc/kong/kong.logrotate + +- Path : /lib/systemd/system/kong.service + +- Path : /usr/local/kong/gui + Type : directory + +- Path : /usr/local/kong/include/google + Type : directory + +- Path : /usr/local/kong/include/kong + Type : directory + +- Path : /usr/local/kong/lib/engines-3/afalg.so + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/capi.so + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/loader_attic.so + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/padlock.so + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libada.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 + +- Path : /usr/local/kong/lib/libcrypto.so.3 + Needed : + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libexpat.so.1.9.2 + Needed : + - libc.so.6 + +- Path : /usr/local/kong/lib/libsnappy.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 + +- Path : /usr/local/kong/lib/libssl.so.3 + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/ossl-modules/legacy.so + Needed : + - libcrypto.so.3 + - libdl.so.2 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lfs.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lpeg.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lsyslog.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_pack.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_system_constants.so + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lxp.so + Needed : + - libexpat.so.1 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/mime/core.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/pb.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/core.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/serial.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/unix.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/ssl.so + Needed : + - libssl.so.3 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/yaml.so + Needed : + - libyaml-0.so.2 + - libc.so.6 + +- Path : /usr/local/openresty/lualib/cjson.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/lualib/librestysignal.so + +- Path : /usr/local/openresty/lualib/rds/parser.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/lualib/redis/parser.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so + Needed : + - libdl.so.2 + - libm.so.6 + - libpthread.so.0 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-x86-64.so.2 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + +- Path : /usr/local/openresty/nginx/sbin/nginx + Needed : + - libdl.so.2 + - libpthread.so.0 + - libcrypt.so.1 + - libluajit-5.1.so.2 + - libm.so.6 + - libssl.so.3 + - libcrypto.so.3 + - libz.so.1 + - libc.so.6 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + Modules : + - lua-kong-nginx-module + - lua-kong-nginx-module/stream + - lua-resty-events + - lua-resty-lmdb + - ngx_brotli + - ngx_wasmx_module + OpenSSL : OpenSSL 3.2.3 3 Sep 2024 + DWARF : True + DWARF - ngx_http_request_t related DWARF DIEs: True + +- Path : /usr/local/openresty/site/lualib/libatc_router.so + Needed : + - libgcc_s.so.1 + - libpthread.so.0 + - libdl.so.2 + - libc.so.6 + - ld-linux-x86-64.so.2 + +- Path : /usr/local/openresty/site/lualib/libsimdjson_ffi.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 +