From 1212a6b3ce2eb21fb2a68779dce9b653a14c9102 Mon Sep 17 00:00:00 2001 From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:39:07 -0500 Subject: [PATCH 1/4] Drop support for building core on Ubuntu Bionic and add support for building it on Jammy. --- .github/workflows/clp-core-build.yaml | 14 ++++---- README.md | 8 ++--- components/core/README.md | 2 +- .../Dockerfile | 4 +-- .../build.sh | 2 +- .../install-prebuilt-packages.sh | 34 ------------------- .../{ubuntu-bionic => ubuntu-jammy}/README.md | 0 .../install-all.sh | 0 .../install-packages-from-source.sh | 1 - .../ubuntu-jammy/install-prebuilt-packages.sh | 21 ++++++++++++ 10 files changed, 36 insertions(+), 50 deletions(-) rename components/core/tools/docker-images/{clp-env-base-ubuntu-bionic => clp-env-base-ubuntu-jammy}/Dockerfile (73%) rename components/core/tools/docker-images/{clp-env-base-ubuntu-bionic => clp-env-base-ubuntu-jammy}/build.sh (53%) mode change 100644 => 100755 delete mode 100755 components/core/tools/scripts/lib_install/ubuntu-bionic/install-prebuilt-packages.sh rename components/core/tools/scripts/lib_install/{ubuntu-bionic => ubuntu-jammy}/README.md (100%) rename components/core/tools/scripts/lib_install/{ubuntu-bionic => ubuntu-jammy}/install-all.sh (100%) rename components/core/tools/scripts/lib_install/{ubuntu-bionic => ubuntu-jammy}/install-packages-from-source.sh (83%) create mode 100755 components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh diff --git a/.github/workflows/clp-core-build.yaml b/.github/workflows/clp-core-build.yaml index 75c254951..01a369558 100644 --- a/.github/workflows/clp-core-build.yaml +++ b/.github/workflows/clp-core-build.yaml @@ -73,14 +73,14 @@ jobs: local_registry_port: "5000" token: "${{secrets.GITHUB_TOKEN}}" - ubuntu-bionic: + ubuntu-focal: runs-on: "ubuntu-latest" services: registry: image: "registry:2" ports: [ "5000:5000" ] env: - OS_NAME: "ubuntu-bionic" + OS_NAME: "ubuntu-focal" steps: - uses: "actions/checkout@v3" with: @@ -108,18 +108,18 @@ jobs: with: os_name: "${{env.OS_NAME}}" deps_image_changed: "${{steps.filter.outputs.image}}" - push_binaries_image: false + push_binaries_image: true local_registry_port: "5000" token: "${{secrets.GITHUB_TOKEN}}" - ubuntu-focal: + ubuntu-jammy: runs-on: "ubuntu-latest" services: registry: image: "registry:2" ports: [ "5000:5000" ] env: - OS_NAME: "ubuntu-focal" + OS_NAME: "ubuntu-jammy" steps: - uses: "actions/checkout@v3" with: @@ -147,6 +147,6 @@ jobs: with: os_name: "${{env.OS_NAME}}" deps_image_changed: "${{steps.filter.outputs.image}}" - push_binaries_image: true + push_binaries_image: false local_registry_port: "5000" - token: "${{secrets.GITHUB_TOKEN}}" + token: "${{secrets.GITHUB_TOKEN}}" \ No newline at end of file diff --git a/README.md b/README.md index e1fbb5238..508d384bf 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ directory: # Packages The packages held by this [repository](https://github.com/orgs/y-scope/packages?repo_name=clp) are: -1. Docker Image `clp/clp-core-dependencies-x86-ubuntu-focal` - - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Focal x86 environment -2. Docker Image `clp/clp-core-dependencies-x86-ubuntu-bionic` - - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Bionic x86 environment +1. Docker Image `clp/clp-core-dependencies-x86-ubuntu-jammy` + - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Jammy x86 environment +2. Docker Image `clp/clp-core-dependencies-x86-ubuntu-focal` + - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Focal x86 environment 3. Docker Image `clp/clp-core-dependencies-x86-centos7.4` - A docker image containing all the necessary dependencies to build CLP core in a Centos 7.4 x86 environment 4. Docker Image `clp/clp-execution-x86-ubuntu-focal` diff --git a/components/core/README.md b/components/core/README.md index 97de33dca..5e0221d1b 100644 --- a/components/core/README.md +++ b/components/core/README.md @@ -57,8 +57,8 @@ See the relevant README for your OS: * [CentOS 7.4](./tools/scripts/lib_install/centos7.4/README.md) * [macOS 12](./tools/scripts/lib_install/macos-12/README.md) -* [Ubuntu 18.04](./tools/scripts/lib_install/ubuntu-bionic/README.md) * [Ubuntu 20.04](./tools/scripts/lib_install/ubuntu-focal/README.md) +* [Ubuntu 22.04](./tools/scripts/lib_install/ubuntu-jammy/README.md) Want to build natively on an OS not listed here? You can file a [feature request](https://github.com/y-scope/clp/issues/new?assignees=&labels=enhancement&template=feature-request.yml). diff --git a/components/core/tools/docker-images/clp-env-base-ubuntu-bionic/Dockerfile b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile similarity index 73% rename from components/core/tools/docker-images/clp-env-base-ubuntu-bionic/Dockerfile rename to components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile index 31735cfe6..a3354215f 100644 --- a/components/core/tools/docker-images/clp-env-base-ubuntu-bionic/Dockerfile +++ b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/Dockerfile @@ -1,11 +1,11 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy WORKDIR /root RUN mkdir -p ./tools/scripts/lib_install ADD ./tools/scripts/lib_install ./tools/scripts/lib_install -RUN ./tools/scripts/lib_install/ubuntu-bionic/install-all.sh +RUN ./tools/scripts/lib_install/ubuntu-jammy/install-all.sh # Reset the working directory so that it's accessible by any user who runs the # container diff --git a/components/core/tools/docker-images/clp-env-base-ubuntu-bionic/build.sh b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/build.sh old mode 100644 new mode 100755 similarity index 53% rename from components/core/tools/docker-images/clp-env-base-ubuntu-bionic/build.sh rename to components/core/tools/docker-images/clp-env-base-ubuntu-jammy/build.sh index 05fac618a..e8cccfaf2 --- a/components/core/tools/docker-images/clp-env-base-ubuntu-bionic/build.sh +++ b/components/core/tools/docker-images/clp-env-base-ubuntu-jammy/build.sh @@ -3,4 +3,4 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" component_root=${script_dir}/../../../ -docker build -t clp-core-dependencies-x86-ubuntu-bionic:dev ${component_root} --file ${script_dir}/Dockerfile +docker build -t clp-core-dependencies-x86-ubuntu-jammy:dev ${component_root} --file ${script_dir}/Dockerfile diff --git a/components/core/tools/scripts/lib_install/ubuntu-bionic/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/ubuntu-bionic/install-prebuilt-packages.sh deleted file mode 100755 index 737012d72..000000000 --- a/components/core/tools/scripts/lib_install/ubuntu-bionic/install-prebuilt-packages.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install -y \ - ca-certificates \ - checkinstall \ - cmake \ - curl \ - build-essential \ - gcc-8 \ - g++-8 \ - libboost-filesystem-dev \ - libboost-iostreams-dev \ - libboost-program-options-dev \ - libssl-dev \ - openjdk-11-jdk \ - python3 \ - python3-pip \ - rsync \ - software-properties-common - -# Install latest version of git -add-apt-repository -y ppa:git-core/ppa -apt-get update -apt-get install -y git - -# Install latest version of CMAKE -curl -fsSl https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null -apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" -apt-get update -apt-get install -y cmake - -# Switch to gcc-8 -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 diff --git a/components/core/tools/scripts/lib_install/ubuntu-bionic/README.md b/components/core/tools/scripts/lib_install/ubuntu-jammy/README.md similarity index 100% rename from components/core/tools/scripts/lib_install/ubuntu-bionic/README.md rename to components/core/tools/scripts/lib_install/ubuntu-jammy/README.md diff --git a/components/core/tools/scripts/lib_install/ubuntu-bionic/install-all.sh b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-all.sh similarity index 100% rename from components/core/tools/scripts/lib_install/ubuntu-bionic/install-all.sh rename to components/core/tools/scripts/lib_install/ubuntu-jammy/install-all.sh diff --git a/components/core/tools/scripts/lib_install/ubuntu-bionic/install-packages-from-source.sh b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh similarity index 83% rename from components/core/tools/scripts/lib_install/ubuntu-bionic/install-packages-from-source.sh rename to components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh index 583d80130..ccbae9230 100755 --- a/components/core/tools/scripts/lib_install/ubuntu-bionic/install-packages-from-source.sh +++ b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh @@ -3,7 +3,6 @@ ./tools/scripts/lib_install/fmtlib.sh 8.0.1 ./tools/scripts/lib_install/libarchive.sh 3.5.1 ./tools/scripts/lib_install/lz4.sh 1.8.2 -./tools/scripts/lib_install/mariadb-connector-c.sh 3.2.3 ./tools/scripts/lib_install/msgpack.sh 6.0.0 ./tools/scripts/lib_install/spdlog.sh 1.9.2 ./tools/scripts/lib_install/zstandard.sh 1.4.9 diff --git a/components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh new file mode 100755 index 000000000..ab8382fdc --- /dev/null +++ b/components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash + +apt-get update +DEBIAN_FRONTEND=noninteractive apt-get install -y \ + ca-certificates \ + checkinstall \ + cmake \ + curl \ + build-essential \ + git \ + libboost-filesystem-dev \ + libboost-iostreams-dev \ + libboost-program-options-dev \ + libmariadb-dev \ + libssl-dev \ + openjdk-11-jdk \ + pkg-config \ + python3 \ + python3-pip \ + rsync \ + software-properties-common From 67fa0022e15cf42393fa2863e86c1393ae4143a1 Mon Sep 17 00:00:00 2001 From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:21:04 -0500 Subject: [PATCH 2/4] Change to test triggering workflow in PR. --- components/core/tests/test_log_files/log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/core/tests/test_log_files/log.txt b/components/core/tests/test_log_files/log.txt index 51309fc85..952482f3a 100644 --- a/components/core/tests/test_log_files/log.txt +++ b/components/core/tests/test_log_files/log.txt @@ -1,4 +1,4 @@ -2016-05-08 07:34:05.251 MyDog123 APet4123\test.txt +2016-05-08 07:34:05.251 MyDog123 APet4123\test.txt test 2016-05-08 07:34:05.252 statictext123 2016-05-08 07:34:05.253 123 2016-05-08 07:34:05.254 123.123 From 7b1ff7b5a62f3b24c1b77ecbff444a8853141c53 Mon Sep 17 00:00:00 2001 From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:21:29 -0500 Subject: [PATCH 3/4] Undo previous change. --- components/core/tests/test_log_files/log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/core/tests/test_log_files/log.txt b/components/core/tests/test_log_files/log.txt index 952482f3a..51309fc85 100644 --- a/components/core/tests/test_log_files/log.txt +++ b/components/core/tests/test_log_files/log.txt @@ -1,4 +1,4 @@ -2016-05-08 07:34:05.251 MyDog123 APet4123\test.txt test +2016-05-08 07:34:05.251 MyDog123 APet4123\test.txt 2016-05-08 07:34:05.252 statictext123 2016-05-08 07:34:05.253 123 2016-05-08 07:34:05.254 123.123 From 9183801d97e757eec783e472850f9256b6cd32ce Mon Sep 17 00:00:00 2001 From: Kirk Rodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Tue, 5 Dec 2023 15:57:44 -0500 Subject: [PATCH 4/4] Remove extraneous space. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 508d384bf..02a5f6b52 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ The packages held by this [repository](https://github.com/orgs/y-scope/packages? 1. Docker Image `clp/clp-core-dependencies-x86-ubuntu-jammy` - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Jammy x86 environment 2. Docker Image `clp/clp-core-dependencies-x86-ubuntu-focal` - - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Focal x86 environment + - A docker image containing all the necessary dependencies to build CLP core in an Ubuntu Focal x86 environment 3. Docker Image `clp/clp-core-dependencies-x86-centos7.4` - A docker image containing all the necessary dependencies to build CLP core in a Centos 7.4 x86 environment 4. Docker Image `clp/clp-execution-x86-ubuntu-focal`