Skip to content

Commit

Permalink
Do not use pre-built images for CI
Browse files Browse the repository at this point in the history
This will allow us to modify the build environment from git since we
don't depend on our own images anymore.

Note, the only reason we might want to use pre-built images is
turnaround time for CI. But caching on the CI infrastructure should
make the building of the container pretty fast.

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
  • Loading branch information
nicolasbock committed May 7, 2020
1 parent 225a333 commit f41ba08
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 0 deletions.
42 changes: 42 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,32 @@ jobs:
- checkout
- run: ./build.sh docs

docs-test:
docker:
- image: ubuntu:xenial
steps:
- run: apt-get update
- run: apt-get install --assume-yes software-properties-common
- run: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DBA92F17B25AD78F9F2D9F713DEC686D130FF5E4
- run: apt-add-repository ppa:janisozaur/cmake-update
- run: apt-get update
- run: ln -fs /usr/share/zoneinfo/UTC /etc/localtime
- run: apt-get install --assume-yes tzdata
- run: DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
- run: |
apt-get install --assume-yes --no-install-recommends \
apt-utils \
build-essential \
cmake cmake-data \
doxygen \
gfortran \
git-core \
libblas-dev liblapack-dev \
openssh-client \
texlive
- checkout
- run: ./build.sh docs

workflows:
build:
jobs:
Expand All @@ -264,6 +290,22 @@ workflows:
- build-gcc-9-static-serial-external-valgrind-Fortran-double_complex
- build-clang-shared-serial-external
- build-clang-shared-OpenMP-external
- docs-test:
requires:
- build-gcc-4_7-shared-serial-external
- build-gcc-4_7-shared-serial-internal
- build-gcc-4_7-shared-OpenMP-external
- build-gcc-4_7-shared-OpenMP-internal
- build-gcc-9-static-serial-external-valgrind-C-single_real
- build-gcc-9-static-serial-external-valgrind-C-double_real
- build-gcc-9-static-serial-external-valgrind-C-single_complex
- build-gcc-9-static-serial-external-valgrind-C-double_complex
- build-gcc-9-static-serial-external-valgrind-Fortran-single_real
- build-gcc-9-static-serial-external-valgrind-Fortran-double_real
- build-gcc-9-static-serial-external-valgrind-Fortran-single_complex
- build-gcc-9-static-serial-external-valgrind-Fortran-double_complex
- build-clang-shared-serial-external
- build-clang-shared-OpenMP-external
- build-gcc-4_7-shared-serial-external:
requires:
- lint
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,41 @@ jobs:
docs:
name: Build docs
runs-on: ubuntu-latest
needs: lint
container:
image: nicolasbock/bml-ci-docs:2
steps:
- uses: actions/checkout@v1
with:
fetch-depth: 2
- run: ./build.sh docs
docs-test:
name: Build docs (test)
runs-on: ubuntu-latest
needs: lint
container:
image: ubuntu:xenial
steps:
- run: apt-get update
- run: apt-get install --assume-yes software-properties-common
- run: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DBA92F17B25AD78F9F2D9F713DEC686D130FF5E4
- run: apt-add-repository ppa:janisozaur/cmake-update
- run: apt-get update
- run: ln -fs /usr/share/zoneinfo/UTC /etc/localtime
- run: apt-get install --assume-yes tzdata
- run: DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
- run: |
apt-get install --assume-yes --no-install-recommends \
apt-utils \
build-essential \
cmake cmake-data \
doxygen \
gfortran \
git-core \
libblas-dev liblapack-dev \
openssh-client \
texlive
- uses: actions/checkout@v1
with:
fetch-depth: 2
- run: ./build.sh docs

0 comments on commit f41ba08

Please sign in to comment.