Skip to content

Commit

Permalink
chore(cd): drop EOL rhel7 and debian10
Browse files Browse the repository at this point in the history
  • Loading branch information
fffonion authored and AndyZhang0707 committed Jul 26, 2024
1 parent 331bc81 commit 09915f3
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 331 deletions.
25 changes: 5 additions & 20 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
12 changes: 0 additions & 12 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
27 changes: 0 additions & 27 deletions scripts/explain_manifest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
135 changes: 0 additions & 135 deletions scripts/explain_manifest/fixtures/debian-10-amd64.txt

This file was deleted.

Loading

0 comments on commit 09915f3

Please sign in to comment.