Skip to content

Commit

Permalink
Merge pull request #175 from SedFoam/develop
Browse files Browse the repository at this point in the history 
New release : 2212 version
  • Loading branch information
@CyrilleBonamy
CyrilleBonamy authored May 17, 2023
2 parents 93f355e + 98fb83e commit 7f00172
Show file tree
Hide file tree
Showing 363 changed files with 19,168 additions and 4,085 deletions.
224 changes: 42 additions & 182 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
version: 2

commands:
setup:
steps:
- checkout
- run:
name: setup Qemu
command: |
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- run:
name: Create builder
command: |
export DOCKER_CLI_EXPERIMENTAL=enabled
docker context create multi-arch-build
docker buildx create --use multi-arch-build
jobs:
checkstyle:
docker:
Expand Down Expand Up @@ -40,7 +53,7 @@ jobs:
docs-build:
docker:
- image: opencfd/openfoam2106-dev
- image: opencfd/openfoam-dev:2212

environment:
WM_NCOMPPROCS: 2
Expand All @@ -53,8 +66,8 @@ jobs:
name: Install docs packages
command: >
update-ca-certificates &&
apt-get update && apt-get -y install ca-certificates git python3-pip dvisvgm libclang-9-dev &&
apt-get -y install ack-grep libclang-cpp9 wget graphviz tex-gyre texlive-base &&
apt-get update && apt-get -y install ca-certificates git python3-pip dvisvgm libclang-14-dev &&
apt-get -y install ack-grep libclang-cpp14 wget graphviz tex-gyre texlive-base &&
apt-get -y install texlive-latex-extra texlive-fonts-extra texlive-fonts-recommended
- run:
Expand Down Expand Up @@ -115,128 +128,9 @@ jobs:
name: Deploy docs to gh-pages branch
command: gh-pages --dotfiles --message "[skip ci] Updates" --dist docs/_build/html

builddock_nb:
working_directory: /app
docker:
- image: docker:20.10-dind
resource_class: xlarge
steps:
- checkout
- setup_remote_docker
- restore_cache:
keys:
- v1-{{ .Branch }}
paths:
- /caches/app.tar
- run:
name: Load Docker image layer cache
command: |
set +o pipefail
docker load -i /caches/app.tar | true
no_output_timeout: 30m
- run:
name: Build application Docker image
command: |
docker build --cache-from=app -t cbonamy/sedfoam_2106_notebook:latest -f docker/Dockerfile_nb docker
no_output_timeout: 4h
- run:
name: Save Docker image layer cache
command: |
mkdir -p /caches
docker save -o /caches/app.tar cbonamy/sedfoam_2106_notebook:latest
- save_cache:
key: v1-{{ .Branch }}-{{ epoch }}
paths:
- /caches/app.tar
- persist_to_workspace:
root: /caches
paths:
- app.tar
no_output_timeout: 4h

publishdock_nb:
# Use docker-publisher from above as the Docker container to run this job in
docker:
- image: circleci/buildpack-deps:stretch
steps:
# Set up a separate Docker environment to run `docker` commands in
- setup_remote_docker

# Load and un-archive the Docker image
- attach_workspace:
at: /tmp/workspace
- run:
name: Load Docker image
command: docker load --input /tmp/workspace/app.tar

# Log in to Docker Hub and push the image
- run:
name: Publish Docker image
command: |
echo "${DOCKERHUB_PASS}" | docker login --username "${DOCKERHUB_USERNAME}" --password-stdin
docker push cbonamy/sedfoam_2106_notebook:latest
builddock:
working_directory: /app
docker:
- image: docker:20.10-dind
steps:
- checkout
- setup_remote_docker
- restore_cache:
keys:
- v1-{{ .Branch }}
paths:
- /caches/app.tar
- run:
name: Load Docker image layer cache
command: |
set +o pipefail
docker load -i /caches/app.tar | true
no_output_timeout: 30m
- run:
name: Build application Docker image
command: |
docker build --cache-from=app -t cbonamy/$IMAGE_NAME:latest docker
no_output_timeout: 4h
- run:
name: Save Docker image layer cache
command: |
mkdir -p /caches
docker save -o /caches/app.tar cbonamy/$IMAGE_NAME:latest
- save_cache:
key: v1-{{ .Branch }}-{{ epoch }}
paths:
- /caches/app.tar
- persist_to_workspace:
root: /caches
paths:
- app.tar

publishdock:
# Use docker-publisher from above as the Docker container to run this job in
docker:
- image: circleci/buildpack-deps:stretch
steps:
# Set up a separate Docker environment to run `docker` commands in
- setup_remote_docker

# Load and un-archive the Docker image
- attach_workspace:
at: /tmp/workspace
- run:
name: Load Docker image
command: docker load --input /tmp/workspace/app.tar

# Log in to Docker Hub and push the image
- run:
name: Publish Docker image
command: |
echo "${DOCKERHUB_PASS}" | docker login --username "${DOCKERHUB_USERNAME}" --password-stdin
docker push cbonamy/$IMAGE_NAME:latest
build:
docker:
- image: opencfd/openfoam2112-dev
- image: opencfd/openfoam-dev:2212

environment:
WM_NCOMPPROCS: 2
Expand Down Expand Up @@ -268,12 +162,12 @@ jobs:
shopt -s expand_aliases && source /openfoam/bash.rc &&
export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group
- persist_to_workspace:
root: /usr/lib/openfoam/openfoam2112
root: /usr/lib/openfoam/openfoam2212
paths: site

test:
docker:
- image: opencfd/openfoam2112-dev
- image: opencfd/openfoam-dev:2212
working_directory: /root/sedfoam

steps:
Expand All @@ -290,7 +184,7 @@ jobs:
path: /root/sedfoam

- attach_workspace:
at: /usr/lib/openfoam/openfoam2112
at: /usr/lib/openfoam/openfoam2212

- run:
name: sedfoam test1D sedim
Expand All @@ -313,7 +207,7 @@ jobs:

advanced-test:
docker:
- image: opencfd/openfoam2112-dev
- image: opencfd/openfoam-dev:2212
working_directory: /root/sedfoam

steps:
Expand All @@ -330,20 +224,20 @@ jobs:
path: /root/sedfoam

- attach_workspace:
at: /usr/lib/openfoam/openfoam2112
at: /usr/lib/openfoam/openfoam2212

- run:
name: sedfoam 1D Avalanche
name: sedfoam 1D AvalancheMuI
command: >
shopt -s expand_aliases && chmod -R a+rwX /root &&
source /openfoam/bash.rc &&
runuser -l sudofoam -c 'source /openfoam/bash.rc && cd /root/sedfoam/test-ci/1DAvalancheMuI && ./Allrun' &&
cd /root/sedfoam/test-ci/1DAvalancheMuI && python3 test_AvalancheMuI.py
cd /root/sedfoam/test-ci/1DAvalancheMuI && python3 test_1DAvalancheMuI.py
no_output_timeout: 30m

advanced-test1:
docker:
- image: opencfd/openfoam2112-dev
- image: opencfd/openfoam-dev:2212
working_directory: /root/sedfoam

steps:
Expand All @@ -360,7 +254,7 @@ jobs:
path: /root/sedfoam

- attach_workspace:
at: /usr/lib/openfoam/openfoam2112
at: /usr/lib/openfoam/openfoam2212

- run:
name: sedfoam 1DBedLoadTurb
Expand All @@ -383,7 +277,7 @@ jobs:

advanced-test2:
docker:
- image: opencfd/openfoam2112-dev
- image: opencfd/openfoam-dev:2212
working_directory: /root/sedfoam

steps:
Expand All @@ -400,7 +294,7 @@ jobs:
path: /root/sedfoam

- attach_workspace:
at: /usr/lib/openfoam/openfoam2112
at: /usr/lib/openfoam/openfoam2212

- run:
name: sedfoam 1DWetAvalanche
Expand All @@ -426,34 +320,15 @@ workflows:
- advanced-test2:
requires:
- build
- builddock:
requires:
- test
- advanced-test1
- advanced-test2
filters:
branches:
only:
- master
- develop
- publishdock:
requires:
- builddock
- builddock_nb:
requires:
- publishdock
- publishdock_nb:
requires:
- builddock_nb
- docs-build
- docs-deploy:
requires:
- docs-build
filters:
branches:
only:
- master
- develop
# - docs-build
# - docs-deploy:
# requires:
# - docs-build
# filters:
# branches:
# only:
# - master
# - develop
weekly:
triggers:
- schedule:
Expand All @@ -477,23 +352,8 @@ workflows:
- advanced-test2:
requires:
- build
- builddock:
requires:
- test
- advanced-test
- advanced-test1
- advanced-test2
- publishdock:
requires:
- builddock
- builddock_nb:
requires:
- publishdock
- publishdock_nb:
requires:
- builddock_nb
- docs-build
- docs-deploy:
requires:
- docs-build
# - docs-build
# - docs-deploy:
# requires:
# - docs-build

Loading

0 comments on commit 7f00172

Please sign in to comment.