From bfdaec3c79f4fe004554ad2a5aebd88cde6c1e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Wed, 20 Nov 2024 10:09:00 +0100 Subject: [PATCH] #349: ci: use DARMA-tasking/workflows images Use images from the `workflows` repository and remove redundant docker code in `magistrate`. --- .env | 2 +- .../dockerimage-clang-10-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-11-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-12-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-13-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-14-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-8-ubuntu-mpich.yml | 17 +-- .../dockerimage-clang-9-ubuntu-mpich.yml | 17 +-- .../dockerimage-gcc-10-ubuntu-mpich.yml | 17 +-- .../dockerimage-gcc-8-ubuntu-mpich.yml | 17 +-- .../dockerimage-gcc-9-ubuntu-mpich.yml | 17 +-- .../dockerimage-nvcc-11-ubuntu-mpich.yml | 17 +-- Dockerfile | 1 - ci/docker/ubuntu-18.04-clang-cpp.dockerfile | 92 ---------------- ci/docker/ubuntu-18.04-gnu-cpp.dockerfile | 100 ------------------ ci/docker/ubuntu-18.04-intel-cpp.dockerfile | 93 ---------------- ci/docker/ubuntu-20.04-clang-cpp.dockerfile | 1 - ci/docker/ubuntu-20.04-gnu-cpp.dockerfile | 1 - ci/docker/ubuntu-20.04-gnu-docs.dockerfile | 73 ------------- ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile | 90 ---------------- ci/docker/ubuntu-22.04-clang-cpp.dockerfile | 94 ---------------- docker-compose.yml | 39 +------ scripts/check_containers.sh | 24 ----- scripts/workflow-template.yml | 15 +-- scripts/workflows.ini | 2 +- 25 files changed, 38 insertions(+), 776 deletions(-) delete mode 120000 Dockerfile delete mode 100644 ci/docker/ubuntu-18.04-clang-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-18.04-gnu-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-18.04-intel-cpp.dockerfile delete mode 120000 ci/docker/ubuntu-20.04-clang-cpp.dockerfile delete mode 120000 ci/docker/ubuntu-20.04-gnu-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-20.04-gnu-docs.dockerfile delete mode 100644 ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile delete mode 100644 ci/docker/ubuntu-22.04-clang-cpp.dockerfile delete mode 100755 scripts/check_containers.sh diff --git a/.env b/.env index b8cef152..c01396a0 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -REPO=lifflander1/checkpoint +REPO=lifflander1/vt ARCH=amd64 UBUNTU=22.04 ULIMIT_CORE=0 diff --git a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml index 92ed3dfd..25625050 100644 --- a/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-10-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml index fafafa6c..9dea7a98 100644 --- a/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-11-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml index a7c66bc2..f84c1ed8 100644 --- a/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-12-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml index c7dd6436..86cda99c 100644 --- a/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-13-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 22.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml index 027d8d67..d059838b 100644 --- a/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-14-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 22.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml index 646f3c3c..e53a83c7 100644 --- a/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-8-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 18.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml index c1496111..a829c34a 100644 --- a/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-clang-9-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 18.04 COMPILER_TYPE: clang @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml index 03c54cad..ff2486ee 100644 --- a/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-10-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: gnu @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml index 546543d6..540f19cb 100644 --- a/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-8-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 18.04 COMPILER_TYPE: gnu @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml index 8aef669e..6f41183a 100644 --- a/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-gcc-9-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: gnu @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml index f700d39f..97acdeac 100644 --- a/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml +++ b/.github/workflows/dockerimage-nvcc-11-ubuntu-mpich.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest env: - REPO: lifflander1/checkpoint + REPO: lifflander1/vt ARCH: amd64 UBUNTU: 20.04 COMPILER_TYPE: nvidia @@ -54,22 +54,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) ubuntu-cpp - - name: Build the Docker image + - name: Build and Test run: docker compose run ubuntu-cpp env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push ubuntu-cpp - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/Dockerfile b/Dockerfile deleted file mode 120000 index 82a5b091..00000000 --- a/Dockerfile +++ /dev/null @@ -1 +0,0 @@ -ci/docker/ubuntu-18.04-gnu-cpp.dockerfile \ No newline at end of file diff --git a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile b/ci/docker/ubuntu-18.04-clang-cpp.dockerfile deleted file mode 100644 index c60293df..00000000 --- a/ci/docker/ubuntu-18.04-clang-cpp.dockerfile +++ /dev/null @@ -1,92 +0,0 @@ - -ARG arch=amd64 -ARG distro=18.04 -FROM ${arch}/ubuntu:${distro} as base - -ARG proxy="" -ARG compiler=clang-7 - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ca-certificates \ - curl \ - less \ - git \ - wget \ - ${compiler} \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - unzip \ - valgrind \ - make-guile \ - libomp5 \ - libunwind-dev \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which $(echo ${compiler} | cut -d- -f1)++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/clang++ - -ENV CC=${compiler} \ - CXX=clang++ - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.8.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 0 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -ENV MPI_EXTRA_FLAGS="" \ - CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \ - PATH=/usr/lib/ccache/:$PATH \ - CMAKE_EXE_LINKER_FLAGS="-pthread" - -FROM base as build -COPY . /checkpoint - -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG MAGISTRATE_TESTS_ENABLED -ARG MAGISTRATE_EXAMPLES_ENABLED -ARG MAGISTRATE_WARNINGS_AS_ERRORS -ARG MAGISTRATE_MPI_ENABLED -ARG MAGISTRATE_ASAN_ENABLED -ARG MAGISTRATE_UBSAN_ENABLED -ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ - MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ - MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ - MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ - MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ - MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ - MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build - -FROM build as test -RUN /checkpoint/ci/test_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile deleted file mode 100644 index 88df3ec3..00000000 --- a/ci/docker/ubuntu-18.04-gnu-cpp.dockerfile +++ /dev/null @@ -1,100 +0,0 @@ - -ARG arch=amd64 -ARG distro=18.04 -FROM ${arch}/ubuntu:${distro} as base - -ARG proxy="" -ARG compiler=gcc-8 - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - g++-$(echo ${compiler} | cut -d- -f2) \ - ca-certificates \ - less \ - curl \ - git \ - wget \ - ${compiler} \ - zlib1g \ - zlib1g-dev \ - unzip \ - ninja-build \ - valgrind \ - make-guile \ - libomp5 \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which g++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/g++ - -RUN ln -s \ - "$(which gcc-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/gcc - -ENV CC=gcc \ - CXX=g++ - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.8.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 1 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -ENV MPI_EXTRA_FLAGS="" \ - PATH=/usr/lib/ccache/:$PATH - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - lcov && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -FROM base as build -COPY . /checkpoint - -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG MAGISTRATE_TESTS_ENABLED -ARG MAGISTRATE_EXAMPLES_ENABLED -ARG MAGISTRATE_WARNINGS_AS_ERRORS -ARG MAGISTRATE_MPI_ENABLED -ARG MAGISTRATE_ASAN_ENABLED -ARG MAGISTRATE_UBSAN_ENABLED -ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ - MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ - MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ - MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ - MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ - MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ - MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build - -FROM build as test -RUN /checkpoint/ci/test_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-cpp.dockerfile deleted file mode 100644 index 3a700350..00000000 --- a/ci/docker/ubuntu-18.04-intel-cpp.dockerfile +++ /dev/null @@ -1,93 +0,0 @@ - -ARG compiler=icc-18 -FROM lifflander1/${compiler} as base - -ARG proxy="" - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ca-certificates \ - less \ - curl \ - git \ - wget \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - valgrind \ - make-guile \ - libomp5 \ - unzip \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - /opt/intel/install/bin/icpc \ - /opt/intel/install/bin/g++ - -RUN ln -s \ - /opt/intel/install/bin/icc \ - /opt/intel/install/bin/gcc - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} -ENV PATH=/cmake/bin/:$PATH - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.8.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV LESSCHARSET=utf-8 - -ENV CC=/opt/intel/install/bin/icc \ - CXX=/opt/intel/install/bin/icpc - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 1 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -ENV MPI_EXTRA_FLAGS="" \ - PATH=/usr/lib/ccache/:$PATH \ - LD_LIBRARY_PATH=/opt/intel/ld_library_path - -FROM base as build -COPY . /checkpoint - -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG MAGISTRATE_TESTS_ENABLED -ARG MAGISTRATE_EXAMPLES_ENABLED -ARG MAGISTRATE_WARNINGS_AS_ERRORS -ARG MAGISTRATE_MPI_ENABLED -ARG MAGISTRATE_ASAN_ENABLED -ARG MAGISTRATE_UBSAN_ENABLED -ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ - MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ - MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ - MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ - MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ - MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ - MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build - -FROM build as test -RUN /checkpoint/ci/test_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile b/ci/docker/ubuntu-20.04-clang-cpp.dockerfile deleted file mode 120000 index 6484110b..00000000 --- a/ci/docker/ubuntu-20.04-clang-cpp.dockerfile +++ /dev/null @@ -1 +0,0 @@ -ubuntu-18.04-clang-cpp.dockerfile \ No newline at end of file diff --git a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile deleted file mode 120000 index 2b4c68e7..00000000 --- a/ci/docker/ubuntu-20.04-gnu-cpp.dockerfile +++ /dev/null @@ -1 +0,0 @@ -ubuntu-18.04-gnu-cpp.dockerfile \ No newline at end of file diff --git a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile b/ci/docker/ubuntu-20.04-gnu-docs.dockerfile deleted file mode 100644 index 8ea2af0c..00000000 --- a/ci/docker/ubuntu-20.04-gnu-docs.dockerfile +++ /dev/null @@ -1,73 +0,0 @@ - -ARG arch=amd64 -FROM ${arch}/ubuntu:20.04 AS base - -ARG proxy="" -ARG compiler=gcc-8 -ARG token - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ${compiler} \ - ca-certificates \ - ccache \ - curl \ - ghostscript \ - git \ - libmpich-dev \ - mpich \ - ninja-build \ - python3 \ - python3-jinja2 \ - python3-pygments \ - texlive-font-utils \ - unzip \ - wget \ - zlib1g \ - zlib1g-dev &&\ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} -ENV PATH=/cmake/bin/:$PATH - -COPY ./ci/deps/doxygen.sh doxygen.sh -RUN ./doxygen.sh 1.8.16 -ENV PATH=/doxygen/bin/:$PATH - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.8.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 1 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -ENV MPI_EXTRA_FLAGS="" \ - CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \ - CC=mpicc \ - CXX=mpicxx \ - LESSCHARSET=utf-8 \ - PATH=/usr/lib/ccache/:$PATH - -FROM base AS build -COPY . /checkpoint - -ARG token -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG CMAKE_BUILD_TYPE - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build "${token}" diff --git a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile b/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile deleted file mode 100644 index fb99355c..00000000 --- a/ci/docker/ubuntu-20.04-nvidia-cpp.dockerfile +++ /dev/null @@ -1,90 +0,0 @@ - -ARG compiler=11.2.2 -ARG arch=amd64 -ARG ubuntu=20.04 -FROM --platform=${arch} nvidia/cuda:${compiler}-devel-ubuntu${ubuntu} as base - -ARG proxy="" - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ca-certificates \ - curl \ - less \ - git \ - wget \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - gnupg \ - make-guile \ - unzip \ - libomp5 \ - valgrind \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -ENV CC=gcc \ - CXX=g++ - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.12.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 0 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -RUN mkdir -p /nvcc_wrapper/build && \ - wget https://raw.githubusercontent.com/kokkos/kokkos/master/bin/nvcc_wrapper -P /nvcc_wrapper/build && \ - chmod +x /nvcc_wrapper/build/nvcc_wrapper - -ENV MPI_EXTRA_FLAGS="" \ - PATH=/usr/lib/ccache/:/nvcc_wrapper/build:$PATH \ - CXX=nvcc_wrapper - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -FROM base as build -COPY . /checkpoint - -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG MAGISTRATE_TESTS_ENABLED -ARG MAGISTRATE_EXAMPLES_ENABLED -ARG MAGISTRATE_WARNINGS_AS_ERRORS -ARG MAGISTRATE_MPI_ENABLED -ARG MAGISTRATE_ASAN_ENABLED -ARG MAGISTRATE_UBSAN_ENABLED -ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ - MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ - MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ - MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ - MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ - MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ - MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build - -FROM build as test -RUN /checkpoint/ci/test_cpp.sh /checkpoint /build diff --git a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile b/ci/docker/ubuntu-22.04-clang-cpp.dockerfile deleted file mode 100644 index 0bbeb1b1..00000000 --- a/ci/docker/ubuntu-22.04-clang-cpp.dockerfile +++ /dev/null @@ -1,94 +0,0 @@ - -ARG arch=amd64 -ARG distro=22.04 -FROM ${arch}/ubuntu:${distro} as base - -ARG proxy="" -ARG compiler=clang-13 - -ENV https_proxy=${proxy} \ - http_proxy=${proxy} - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y -q && \ - apt-get install -y -q --no-install-recommends \ - ca-certificates \ - curl \ - less \ - git \ - wget \ - ${compiler} \ - zlib1g \ - zlib1g-dev \ - ninja-build \ - unzip \ - valgrind \ - make-guile \ - libomp5 \ - libunwind-dev \ - ccache && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -RUN ln -s \ - "$(which $(echo ${compiler} | cut -d- -f1)++-$(echo ${compiler} | cut -d- -f2))" \ - /usr/bin/clang++ - -ENV CC=${compiler} \ - CXX=clang++ - -ARG arch - -COPY ./ci/deps/cmake.sh cmake.sh -RUN ./cmake.sh 3.23.4 ${arch} - -COPY ./ci/deps/mpich.sh mpich.sh -RUN ./mpich.sh 3.3.2 -j4 - -ENV PATH=/cmake/bin/:$PATH -ENV LESSCHARSET=utf-8 - -COPY ./ci/deps/gtest.sh gtest.sh -RUN ./gtest.sh 1.8.1 /pkgs -ENV GTEST_ROOT=/pkgs/gtest/install - -COPY ./ci/deps/kokkos.sh kokkos.sh -RUN ./kokkos.sh 4.1.00 /pkgs 0 -ENV KOKKOS_ROOT=/pkgs/kokkos/install - -COPY ./ci/deps/kokkos-kernels.sh kokkos-kernels.sh -RUN ./kokkos-kernels.sh 4.1.00 /pkgs -ENV KOKKOS_KERNELS_ROOT=/pkgs/kokkos-kernels/install - -ENV MPI_EXTRA_FLAGS="" \ - CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \ - PATH=/usr/lib/ccache/:$PATH \ - CMAKE_EXE_LINKER_FLAGS="-pthread" - -FROM base as build -COPY . /checkpoint - -ARG MAGISTRATE_DOXYGEN_ENABLED -ARG MAGISTRATE_TESTS_ENABLED -ARG MAGISTRATE_EXAMPLES_ENABLED -ARG MAGISTRATE_WARNINGS_AS_ERRORS -ARG MAGISTRATE_MPI_ENABLED -ARG MAGISTRATE_ASAN_ENABLED -ARG MAGISTRATE_UBSAN_ENABLED -ARG MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED - -ENV MAGISTRATE_DOXYGEN_ENABLED=${MAGISTRATE_DOXYGEN_ENABLED} \ - MAGISTRATE_TESTS_ENABLED=${MAGISTRATE_TESTS_ENABLED} \ - MAGISTRATE_EXAMPLES_ENABLED=${MAGISTRATE_EXAMPLES_ENABLED} \ - MAGISTRATE_WARNINGS_AS_ERRORS=${MAGISTRATE_WARNINGS_AS_ERRORS} \ - MAGISTRATE_MPI_ENABLED=${MAGISTRATE_MPI_ENABLED} \ - MAGISTRATE_ASAN_ENABLED=${MAGISTRATE_ASAN_ENABLED} \ - MAGISTRATE_UBSAN_ENABLED=${MAGISTRATE_UBSAN_ENABLED} \ - MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED=${MAGISTRATE_SERIALIZATION_ERROR_CHECKING_ENABLED} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -RUN /checkpoint/ci/build_cpp.sh /checkpoint /build - -FROM build as test -RUN /checkpoint/ci/test_cpp.sh /checkpoint /build diff --git a/docker-compose.yml b/docker-compose.yml index 9c49b134..961945c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,9 +42,6 @@ # $ COMPILER=gcc-8 docker-compose run ubuntu-cpp # -# Need verision >= 3.5 for the features in use -version: '3.5' - # Named volumes must be predefined according the docker compose rules. Many # combinations have already been added, but if a needed configuration is missing # add it to this list. @@ -113,18 +110,7 @@ services: # Ubuntu gcc-8 debug build: # docker-compose run -e CMAKE_BUILD_TYPE=debug ubuntu-cpp ubuntu-cpp: - image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-cpp.dockerfile - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - args: &default-args - arch: ${ARCH} - proxy: ${PROXY} - compiler: ${COMPILER} - distro: ${UBUNTU} + image: ${REPO}:wf-${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp ulimits: &ulimits core: ${ULIMIT_CORE} environment: @@ -139,13 +125,6 @@ services: ubuntu-cpp-vt: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-cpp.dockerfile - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - args: *default-args ulimits: *ulimits environment: <<: [*ccache, *checkpointopts] @@ -167,13 +146,6 @@ services: # $ /checkpoint/ci/test_cpp.sh /checkpoint /build ubuntu-cpp-interactive: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-cpp.dockerfile - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - args: *default-args ulimits: *ulimits environment: <<: [*ccache, *checkpointopts] @@ -184,15 +156,6 @@ services: # container baseline. ubuntu-docs: image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-docs - build: - context: . - target: base - dockerfile: ci/docker/ubuntu-${UBUNTU}-${COMPILER_TYPE}-docs.dockerfile - cache_from: - - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-${COMPILER}-cpp - args: - <<: *default-args - token: ${TOKEN} ulimits: *ulimits environment: <<: *ccache diff --git a/scripts/check_containers.sh b/scripts/check_containers.sh deleted file mode 100755 index 2bd8fb9c..00000000 --- a/scripts/check_containers.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env bash -# Decide whether we should pull or build the Docker images in CI. -# This is consistent with GitHub (actions/checkout@v3). - -diff_latest() { - printf "Files modified in the latest pull request:\n" >&2 - local base_ref - if [[ $(git branch --show-current) == "develop" ]] - then - base_ref=$(git log --skip=1 -1 --merges --pretty=format:%H) - else - base_ref="origin/develop" - fi - git diff --name-only "$base_ref"...HEAD -} - -# Check if there were any dockerfiles modified in the latest pull request. -# Print the modified files list to stderr as well. -if diff_latest | tee >(cat >&2) | grep -i -q dockerfile -then - echo "docker compose build --pull" -else - echo "docker compose pull --ignore-pull-failures" -fi diff --git a/scripts/workflow-template.yml b/scripts/workflow-template.yml index b274a8dd..88941ede 100644 --- a/scripts/workflow-template.yml +++ b/scripts/workflow-template.yml @@ -47,22 +47,11 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Prepare the base Docker image - shell: bash - run: $(./scripts/check_containers.sh) [% docker_target %] - - name: Build the Docker image + - name: Build and Test run: docker compose run [% docker_target %] env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - name: Docker Push Base Image - if: ${{ success() && github.ref == 'refs/heads/develop' }} - continue-on-error: true - shell: bash - run: | - docker login -u ${{ secrets.DOCKER_USERNAME }} \ - -p ${{ secrets.DOCKER_PASSWORD }} - docker compose push [% docker_target %] - - name: Zip up CMake output + - name: Collect logs run: | zip -j LastTest.log.gz ${{ env.BUILD_ROOT }}/checkpoint/Testing/Temporary/LastTest.log zip -j cmake-output.log.gz ${{ env.BUILD_ROOT }}/checkpoint/cmake-output.log diff --git a/scripts/workflows.ini b/scripts/workflows.ini index c240ea30..0686d6c1 100644 --- a/scripts/workflows.ini +++ b/scripts/workflows.ini @@ -12,7 +12,7 @@ build_type = release ulimit_core = 0 code_coverage = 0 -repo = lifflander1/checkpoint +repo = lifflander1/vt arch = amd64 is_ubuntu = 1 distro = 18.04