diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b59115e9227e..90e99650d35e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,6 @@ name: Package & Release # The workflow to build and release official Kong packages and images. -# -# TODO: -# Do not bump the version of actions/checkout to v4 before dropping rhel7 and amazonlinux2. on: # yamllint disable-line rule:truthy pull_request: @@ -130,15 +127,15 @@ jobs: - name: Cache Git id: cache-git - if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != '' - uses: actions/cache@v3 + if: (matrix.package == 'rpm') && matrix.image != '' + uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3, DO NOT BUMP, v4 BREAKS ON CENTOS7 OR AMAZONLINUX2 with: path: /usr/local/git key: ${{ matrix.label }}-git-2.41.0 - # el-7,8, amazonlinux-2,2023, debian-10 doesn't have git 2.18+, so we need to install it manually + # el-7,8, amazonlinux-2,2023 doesn't have git 2.18+, so we need to install it manually - name: Install newer Git - if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != '' && steps.cache-git.outputs.cache-hit != 'true' + if: (matrix.package == 'rpm') && matrix.image != '' && steps.cache-git.outputs.cache-hit != 'true' run: | if which apt 2>/dev/null; then apt update @@ -152,28 +149,16 @@ jobs: tar xf git-2.41.0.tar.gz cd git-2.41.0 - # https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5948/diffs - if [[ ${{ matrix.image }} == "centos:7" ]]; then - echo 'CFLAGS=-std=gnu99' >> config.mak - fi - make configure ./configure --prefix=/usr/local/git make -j$(nproc) make install - name: Add Git to PATH - if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != '' + if: (matrix.package == 'rpm') && matrix.image != '' run: | echo "/usr/local/git/bin" >> $GITHUB_PATH - - name: Debian Git dependencies - if: matrix.image == 'debian:10' - run: | - apt update - # dependencies for git - apt install -y wget libz-dev libssl-dev libcurl4-gnutls-dev sudo - - name: Checkout Kong source code uses: actions/checkout@v3 diff --git a/BUILD.bazel b/BUILD.bazel index 632194b18c17..d330e7089ef2 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -50,18 +50,6 @@ nfpm_pkg( visibility = ["//visibility:public"], ) -nfpm_pkg( - name = "kong_el7", - config = "//build:package/nfpm.yaml", - env = nfpm_env, - extra_env = { - "RPM_EXTRA_DEPS": "hostname", - }, - packager = "rpm", - pkg_name = "kong.el7", - visibility = ["//visibility:public"], -) - nfpm_pkg( name = "kong_aws2", config = "//build:package/nfpm.yaml", diff --git a/build/README.md b/build/README.md index 7af1d2b7f04f..5abe6e55e73f 100644 --- a/build/README.md +++ b/build/README.md @@ -69,11 +69,9 @@ GITHUB_TOKEN=token bazel build --config release //build:kong --verbose_failures Supported build targets for binary packages: - `:kong_deb` -- `:kong_el7` - `:kong_el8` - `:kong_aws2` - `:kong_aws2023` -- `:kong_apk` For example, to build the deb package: diff --git a/scripts/explain_manifest/config.py b/scripts/explain_manifest/config.py index 398c9346c96a..ba49ebe96d26 100644 --- a/scripts/explain_manifest/config.py +++ b/scripts/explain_manifest/config.py @@ -80,20 +80,6 @@ def transform(f: FileInfo): }, }, ), - "el7-amd64": ExpectSuite( - name="Redhat 7 (amd64)", - manifest="fixtures/el7-amd64.txt", - use_rpath=True, - tests={ - common_suites: {}, - libc_libcpp_suites: { - "libc_max_version": "2.17", - # gcc 4.8.5 - "libcxx_max_version": "3.4.19", - "cxxabi_max_version": "1.3.7", - }, - } - ), "el8-amd64": ExpectSuite( name="Redhat 8 (amd64)", manifest="fixtures/el8-amd64.txt", @@ -150,19 +136,6 @@ def transform(f: FileInfo): }, } ), - "debian-10-amd64": ExpectSuite( - name="Debian 10 (amd64)", - manifest="fixtures/debian-10-amd64.txt", - tests={ - common_suites: {}, - libc_libcpp_suites: { - "libc_max_version": "2.28", - # gcc 8.3.0 - "libcxx_max_version": "3.4.25", - "cxxabi_max_version": "1.3.11", - }, - } - ), "debian-11-amd64": ExpectSuite( name="Debian 11 (amd64)", manifest="fixtures/debian-11-amd64.txt", diff --git a/scripts/explain_manifest/fixtures/debian-10-amd64.txt b/scripts/explain_manifest/fixtures/debian-10-amd64.txt deleted file mode 100644 index 174773be772b..000000000000 --- a/scripts/explain_manifest/fixtures/debian-10-amd64.txt +++ /dev/null @@ -1,135 +0,0 @@ -- Path : /etc/kong/kong.logrotate - -- Path : /usr/local/kong/include/google - Type : directory - -- Path : /usr/local/kong/lib/engines-1.1/afalg.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/engines-1.1/capi.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/engines-1.1/padlock.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/libcrypto.so.1.1 - Needed : - - libstdc++.so.6 - - libm.so.6 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/libssl.so.1.1 - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/lib/lua/5.1/lfs.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lpeg.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lsyslog.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lua_pack.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lua_system_constants.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/mime/core.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/pb.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/core.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/serial.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/unix.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/ssl.so - Needed : - - libssl.so.1.1 - - libcrypto.so.1.1 - - libc.so.6 - -- 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 - Needed : - - libc.so.6 - -- 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/sbin/nginx - Needed : - - libdl.so.2 - - libpthread.so.0 - - libcrypt.so.1 - - libluajit-5.1.so.2 - - libm.so.6 - - libssl.so.1.1 - - libcrypto.so.1.1 - - libz.so.1 - - libc.so.6 - Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib - Modules : - - lua-kong-nginx-module - - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1o 3 May 2022 - DWARF : True - DWARF - ngx_http_request_t related DWARF DIEs: True - diff --git a/scripts/explain_manifest/fixtures/el7-amd64.txt b/scripts/explain_manifest/fixtures/el7-amd64.txt deleted file mode 100644 index cb5d0045ac2c..000000000000 --- a/scripts/explain_manifest/fixtures/el7-amd64.txt +++ /dev/null @@ -1,135 +0,0 @@ -- Path : /etc/kong/kong.logrotate - -- Path : /usr/local/kong/include/google - Type : directory - -- Path : /usr/local/kong/lib/engines-1.1/afalg.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/engines-1.1/capi.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/engines-1.1/padlock.so - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/libcrypto.so.1.1 - Needed : - - libstdc++.so.6 - - libm.so.6 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/kong/lib/libssl.so.1.1 - Needed : - - libstdc++.so.6 - - libm.so.6 - - libcrypto.so.1.1 - - libdl.so.2 - - libc.so.6 - Runpath : /usr/local/kong/lib - -- Path : /usr/local/lib/lua/5.1/lfs.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lpeg.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lsyslog.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lua_pack.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/lua_system_constants.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/mime/core.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/pb.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/core.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/serial.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/socket/unix.so - Needed : - - libc.so.6 - -- Path : /usr/local/lib/lua/5.1/ssl.so - Needed : - - libssl.so.1.1 - - libcrypto.so.1.1 - - libc.so.6 - -- 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 - Needed : - - libc.so.6 - -- 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/sbin/nginx - Needed : - - libdl.so.2 - - libpthread.so.0 - - libcrypt.so.1 - - libluajit-5.1.so.2 - - libm.so.6 - - libssl.so.1.1 - - libcrypto.so.1.1 - - libz.so.1 - - libc.so.6 - Rpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib - Modules : - - lua-kong-nginx-module - - lua-kong-nginx-module/stream - OpenSSL : OpenSSL 1.1.1o 3 May 2022 - DWARF : True - DWARF - ngx_http_request_t related DWARF DIEs: True -