mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
[OF6] update CircleCI configuration
by default test against OF6 from now on, thus install openfoam6 package instead of openfoam4
This commit is contained in:
@ -21,18 +21,18 @@ jobs:
|
||||
|
||||
- run:
|
||||
name: Make project and user dir
|
||||
command: mkdir -p /root/CFDEM/CFDEMcoupling && mkdir -p /root/CFDEM/-4.1
|
||||
command: mkdir -p /root/CFDEM/CFDEMcoupling && mkdir -p /root/CFDEM/-6
|
||||
|
||||
- checkout:
|
||||
path: /root/CFDEM/CFDEMcoupling
|
||||
|
||||
- run:
|
||||
name: Add OpenFOAM package repository
|
||||
command: sudo apt-get install -y software-properties-common wget apt-transport-https && sudo add-apt-repository http://dl.openfoam.org/ubuntu && sudo sh -c "wget -O - http://dl.openfoam.org/gpg.key | apt-key add -"
|
||||
command: sudo apt-get install -y software-properties-common wget apt-transport-https && sudo sh -c "wget -O - http://dl.openfoam.org/gpg.key | apt-key add -" && sudo add-apt-repository http://dl.openfoam.org/ubuntu
|
||||
|
||||
- run:
|
||||
name: Install OpenFOAM 4.1
|
||||
command: sudo apt-get update && sudo apt-get -y install openfoam4
|
||||
name: Install OpenFOAM 6
|
||||
command: sudo apt-get update && sudo apt-get -y install openfoam6
|
||||
|
||||
- run:
|
||||
name: Clone LIGGGHTS repository
|
||||
@ -42,7 +42,7 @@ jobs:
|
||||
name: Build LIGGGHTS
|
||||
command: >
|
||||
shopt -s expand_aliases &&
|
||||
source /opt/openfoam4/etc/bashrc &&
|
||||
source /opt/openfoam6/etc/bashrc &&
|
||||
source /root/CFDEM/CFDEMcoupling/etc/bashrc &&
|
||||
bash /root/CFDEM/CFDEMcoupling/etc/compileLIGGGHTS.sh
|
||||
no_output_timeout: 30m
|
||||
@ -51,7 +51,7 @@ jobs:
|
||||
name: Build CFDEMcoupling library
|
||||
command: >
|
||||
shopt -s expand_aliases &&
|
||||
source /opt/openfoam4/etc/bashrc &&
|
||||
source /opt/openfoam6/etc/bashrc &&
|
||||
source /root/CFDEM/CFDEMcoupling/etc/bashrc &&
|
||||
bash /root/CFDEM/CFDEMcoupling/etc/compileCFDEMcoupling_src.sh
|
||||
|
||||
@ -59,7 +59,7 @@ jobs:
|
||||
name: Build CFDEMcoupling solvers
|
||||
command: >
|
||||
shopt -s expand_aliases &&
|
||||
source /opt/openfoam4/etc/bashrc &&
|
||||
source /opt/openfoam6/etc/bashrc &&
|
||||
source /root/CFDEM/CFDEMcoupling/etc/bashrc &&
|
||||
bash /root/CFDEM/CFDEMcoupling/etc/compileCFDEMcoupling_sol.sh
|
||||
|
||||
@ -67,6 +67,6 @@ jobs:
|
||||
name: Build CFDEMcoupling utilities
|
||||
command: >
|
||||
shopt -s expand_aliases &&
|
||||
source /opt/openfoam4/etc/bashrc &&
|
||||
source /opt/openfoam6/etc/bashrc &&
|
||||
source /root/CFDEM/CFDEMcoupling/etc/bashrc &&
|
||||
bash /root/CFDEM/CFDEMcoupling/etc/compileCFDEMcoupling_uti.sh
|
||||
|
||||
Reference in New Issue
Block a user