Skip to content

Commit

Permalink
ci: retire ubuntu 18.04 from CI
Browse files Browse the repository at this point in the history
Ubuntu 18.04 is EOL. This change remove it from CI as a follow-up from #4745

Signed-off-by: Manu Bretelle <[email protected]>
  • Loading branch information
chantra authored and yonghong-song committed Nov 6, 2023
1 parent b86067a commit 97c9388
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/bcc-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
os: [{distro: "ubuntu", version: "18.04", nick: bionic}, {distro: "ubuntu", version: "20.04", nick: focal}]
os: [{distro: "ubuntu", version: "20.04", nick: focal}]
llvm_version: [11, 12, 15]
env:
- TYPE: Debug
Expand All @@ -33,9 +33,6 @@ jobs:
- TYPE: Release
PYTHON_TEST_LOGFILE: critical.log
RW_ENGINE_ENABLED: ON
exclude:
- os: {distro: "ubuntu", version: "18.04", nick: bionic}
llvm_version: 15
steps:
- uses: actions/checkout@v2
- uses: dorny/paths-filter@v2
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish-build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
strategy:
matrix:
os: [
{distro: "ubuntu", version: "18.04", nick: bionic, installed_llvm_versions: "11 12"},
{distro: "ubuntu", version: "20.04", nick: focal, installed_llvm_versions: "11 12 15"},
{distro: "fedora", version: "38", nick: "f38", installed_llvm_versions: "this is not used"},
]
Expand All @@ -41,4 +40,4 @@ jobs:
os_nick: ${{ matrix.os.nick }}
llvm_versions: ${{ matrix.os.installed_llvm_versions }}
password: ${{ secrets.GITHUB_TOKEN }}
push: true
push: true
4 changes: 2 additions & 2 deletions docker/build/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG VERSION="18.04"
ARG VERSION="20.04"
FROM ubuntu:${VERSION}

ARG LLVM_VERSION="11"
ENV LLVM_VERSION=$LLVM_VERSION

ARG SHORTNAME="bionic"
ARG SHORTNAME="focal"

ARG RUBY_INSTALL_VERSION="0.8.4"
ENV RUBY_INSTALL_VERSION=$RUBY_INSTALL_VERSION
Expand Down

0 comments on commit 97c9388

Please sign in to comment.