Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-write codebuild.yml and dockerfiles for consistency and code build execution speed #162

Merged
merged 6 commits into from
Aug 24, 2022
Merged

Re-write codebuild.yml and dockerfiles for consistency and code build execution speed #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eebca2
Start making the CI workflows follow a more common naming convention,…
bmoffatt Aug 13, 2022
fbea9f4
Merge branch 'master' into ci-files-refactor
bmoffatt Aug 23, 2022
a0df919
Empty commit
bmoffatt Aug 23, 2022
ee44bc4
Merge branch 'master' into ci-files-refactor
bmoffatt Aug 23, 2022
33de447
Merge branch 'master' into ci-files-refactor
bmoffatt Aug 23, 2022
99fcc09
Merge branch 'master' into ci-files-refactor
bmoffatt Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 2 additions & 9 deletions ci/codebuild/alpine-3.15.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
version: 0.2
# This uses the docker image specified in ci/docker/alpine-linux-3.15
phases:
pre_build:
commands:
- pip install awscli
- ci/codebuild/build-cpp-sdk.sh
build:
commands:
- echo Build started on `date`
- ci/codebuild/build.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_TESTS=ON -DTEST_RESOURCE_PREFIX=alpine315
- ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun alpine315
post_build:
commands:
- ./ci/codebuild/build.sh -DTEST_RESOURCE_PREFIX=lambda-cpp-alpine315
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun
- echo Build completed on `date`

14 changes: 6 additions & 8 deletions ci/codebuild/amazonlinux-2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
version: 0.2
phases:
pre_build:
commands:
- yum install -y zip
build:
commands:
- cmake3 -S . -B build -DENABLE_TESTS=ON -DTEST_RESOURCE_PREFIX=al2arm -GNinja
- cd build
- ninja-build
- ninja-build aws-lambda-package-lambda-test-fun
- ctest3 --output-on-failure
- env
- echo Build started on `date`
- ./ci/codebuild/build.sh -DTEST_RESOURCE_PREFIX=lambda-cpp-al2_$(arch)
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun-no-glibc
- echo Build completed on `date`
15 changes: 5 additions & 10 deletions ci/codebuild/amazonlinux-2017.03.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
version: 0.1
version: 0.2
# This uses the docker image specified in ci/docker/amazon-linux-2017.03
phases:
pre_build:
commands:
- alias cmake=cmake3
- ci/codebuild/build-cpp-sdk.sh
build:
commands:
- echo Build started on `date`
- ci/codebuild/build.sh -DENABLE_TESTS=ON -DTEST_RESOURCE_PREFIX=amzn201703
- ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun amzn201703
- ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun-no-glibc amzn201703
post_build:
commands:
- yum install -y binutils
- ./ci/codebuild/build.sh -DTEST_RESOURCE_PREFIX=lambda-cpp-amzn201703
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun-no-glibc
- echo Build completed on `date`

6 changes: 5 additions & 1 deletion ci/codebuild/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ set -euo pipefail
cd $CODEBUILD_SRC_DIR
mkdir build
cd build
cmake .. -GNinja -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/install $@
cmake .. -GNinja \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=Debug \
-DENABLE_TESTS=ON \
-DCMAKE_INSTALL_PREFIX=/install $@
ninja
ninja install
12 changes: 3 additions & 9 deletions ci/codebuild/ubuntu-18.04.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
version: 0.1
version: 0.2
# This uses the docker image specified in ci/docker/ubuntu-linux-18.04
phases:
pre_build:
commands:
- ci/codebuild/build-cpp-sdk.sh
build:
commands:
- echo Build started on `date`
- ci/codebuild/build.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_TESTS=ON -DTEST_RESOURCE_PREFIX=ubuntu1804
- ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun ubuntu1804
post_build:
commands:
- ./ci/codebuild/build.sh -DTEST_RESOURCE_PREFIX=lambda-cpp-ubuntu1804
- ./ci/codebuild/run-tests.sh aws-lambda-package-lambda-test-fun
- echo Build completed on `date`

18 changes: 16 additions & 2 deletions ci/docker/alpine-linux-3.15
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
FROM alpine:3.15
FROM public.ecr.aws/docker/library/alpine:3.15

RUN apk add --no-cache g++ cmake git bash py3-pip libexecinfo-dev ninja curl-dev zlib-dev zip
RUN apk add --no-cache \
bash \
cmake \
curl-dev \
g++ \
git \
libexecinfo-dev \
ninja \
openssl-libs-static \
zlib-dev \
zip

RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp.git
RUN cmake -Saws-sdk-cpp -Baws-sdk-cpp/build -GNinja \
-DBUILD_ONLY=lambda \
-DENABLE_TESTING=OFF
RUN cd aws-sdk-cpp/build && ninja && ninja install
14 changes: 12 additions & 2 deletions ci/docker/amazon-linux-2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
FROM public.ecr.aws/amazonlinux/amazonlinux:2
RUN yum install -y cmake3 ninja-build git gcc-c++ openssl-devel curl-devel
RUN yum install -y \
cmake3 \
ninja-build \
git \
gcc-c++ \
openssl-devel \
curl-devel \
openssl-static \
zip
RUN git clone https://github.com/aws/aws-sdk-cpp --recurse-submodules
RUN cmake3 -Saws-sdk-cpp -Baws-sdk-cpp/build -DBUILD_ONLY=lambda -DENABLE_TESTING=OFF -GNinja
RUN cd aws-sdk-cpp/build && ninja-build && ninja-build install
RUN yum install -y openssl-static
RUN ln -s /usr/bin/cmake3 /usr/local/bin/cmake
RUN ln -s /usr/bin/ctest3 /usr/local/bin/ctest
RUN ln -s /usr/bin/ninja-build /usr/local/bin/ninja
24 changes: 16 additions & 8 deletions ci/docker/amazon-linux-2017.03
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
FROM amazonlinux:2017.03
FROM public.ecr.aws/amazonlinux/amazonlinux:2018.03
Copy link
Collaborator Author

@bmoffatt bmoffatt Aug 22, 2022 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intentionally leaving the filename out of date with the base image right now to make my life a bit easier in the short term for managing the creation of the replacement CI workflows

why did the repo+tag change? - because I have automation in #159 to re-drives the docker builds from AWS CodeBuild, that DockerHub likes to throttle - however I could not find a :2017.03 tag in the public.ecr.aws gallery - so, next best thing is to use an actually updated tip tag for the original AmazonLinux


RUN yum install gcc64-c++ git ninja-build curl-devel openssl-devel zlib-devel gtest-devel python36-pip zip -y
RUN yum install -y \
gcc-c++ \
git \
ninja-build \
curl-devel \
openssl-devel \
openssl-static \
zlib-devel \
gtest-devel \
zip
RUN curl -fLo cmake-install https://github.com/Kitware/CMake/releases/download/v3.13.0/cmake-3.13.0-Linux-x86_64.sh && \
sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;
RUN git clone --recurse-submodules https://github.com/aws/aws-sdk-cpp

RUN curl -fLo cmake-install https://github.com/Kitware/CMake/releases/download/v3.13.0/cmake-3.13.0-Linux-x86_64.sh; \
sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;

RUN pip-3.6 install --upgrade pip

RUN cmake -Saws-sdk-cpp -Baws-sdk-cpp/build -DBUILD_ONLY=lambda -DENABLE_TESTING=OFF -GNinja
RUN cd aws-sdk-cpp/build && ninja-build && ninja-build install
RUN ln -s /usr/bin/ninja-build /usr/local/bin/ninja
27 changes: 17 additions & 10 deletions ci/docker/ubuntu-linux-18.04
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
FROM ubuntu:18.04
FROM public.ecr.aws/ubuntu/ubuntu:18.04

RUN apt-get update; apt-get install git clang clang-tidy clang-format zlib1g-dev libssl-dev libcurl4-openssl-dev wget \
ninja-build python3-pip zip -y
RUN apt-get update
RUN apt-get install -y \
git \
clang \
zlib1g-dev \
libssl-dev \
libcurl4-openssl-dev \
wget \
ninja-build \
zip


RUN wget -O cmake-install https://github.com/Kitware/CMake/releases/download/v3.13.0/cmake-3.13.0-Linux-x86_64.sh; \
sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;

RUN pip3 install --upgrade pip

RUN git clone https://github.com/aws/aws-sdk-cpp.git --recurse-submodules
RUN wget -O cmake-install https://github.com/Kitware/CMake/releases/download/v3.13.0/cmake-3.13.0-Linux-x86_64.sh && \
sh cmake-install --skip-license --prefix=/usr --exclude-subdirectory;

RUN update-alternatives --set cc /usr/bin/clang
RUN update-alternatives --set c++ /usr/bin/clang++

RUN git clone https://github.com/aws/aws-sdk-cpp.git --recurse-submodules
RUN cmake -Saws-sdk-cpp -Baws-sdk-cpp/build -DBUILD_ONLY=lambda -DENABLE_TESTING=OFF -GNinja
RUN cd aws-sdk-cpp/build && ninja && ninja install