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.

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

Mac ci #780

Merged
merged 36 commits into from
Aug 22, 2021
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5bcf482
first addition
bam241 Aug 20, 2021
515e928
starting simple
bam241 Aug 20, 2021
70ddc4f
fixing indent
bam241 Aug 20, 2021
f5d860f
fixing dagmc path
bam241 Aug 20, 2021
4036e46
fixing MOAB PATH
bam241 Aug 20, 2021
1fa4f92
adding static MOAB
bam241 Aug 20, 2021
4982f78
no patch required ?
bam241 Aug 21, 2021
3c69806
adding numpy
bam241 Aug 21, 2021
d3d15f9
is array missing ?
bam241 Aug 21, 2021
4118f2e
revert ...
bam241 Aug 21, 2021
6eb4f77
numpy correctly ? and no link hdf5 anymore
bam241 Aug 21, 2021
dadfc89
using pyenv...
bam241 Aug 21, 2021
7304bf2
need cython
bam241 Aug 21, 2021
5b1e1ed
xcode-select --install needed ?
bam241 Aug 21, 2021
72a935a
better pyenv ?
bam241 Aug 21, 2021
5c6aca0
no need for gsed
bam241 Aug 21, 2021
6b9da99
no xcode install
bam241 Aug 21, 2021
a422c6d
clsogin the quote
bam241 Aug 21, 2021
8ae8cad
clsogin the quote
bam241 Aug 21, 2021
46647d2
nothing in bash_profile
bam241 Aug 21, 2021
6dbd062
what is python ?
bam241 Aug 21, 2021
19378c8
forcing 3.9.1
bam241 Aug 21, 2021
7f9204d
force pyenv init
bam241 Aug 21, 2021
e4ce871
any better ?gp
bam241 Aug 21, 2021
c545dea
installing python3 with brew
bam241 Aug 21, 2021
7630c73
how about now ?
bam241 Aug 21, 2021
4297d92
pymoab in shared libs
bam241 Aug 21, 2021
0785cc6
forcing SHARED LIB and no STATIC
bam241 Aug 21, 2021
ad4742a
no pymoab
bam241 Aug 21, 2021
1d50d4d
array needed
bam241 Aug 22, 2021
2b53aab
updating install prefix
bam241 Aug 22, 2021
27faea5
adding test
bam241 Aug 22, 2021
682fdcf
some shuffling and no config test...
bam241 Aug 22, 2021
2386228
Apply suggestions from code review
bam241 Aug 22, 2021
38ba4a8
nopymoab -> no python module + some cleaning
bam241 Aug 22, 2021
7ee19e3
adding changelog
bam241 Aug 22, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions .github/workflows/mac_build_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
name: Mac Build/Test

on:
# allows us to run workflows manually
workflow_dispatch:
pull_request:
branches:
- develop
- master
push:
branches:
- develop
- master
release:
types: # This configuration does not affect the page_build event above
- created
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
main:
bam241 marked this conversation as resolved.
Show resolved Hide resolved
runs-on: macos-10.15

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9
- name: Initial setup
shell: bash -l {0}
run: |
brew install eigen gcc@6 hdf5
brew link --overwrite python
pip install numpy cython

# - name: Environment Variables
# shell: bash -l {0}
# run: |
# echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init -)"\nfi' >> $HOME/.bash_profile


- name: Build MOAB
shell: bash -l {0}
run: |
cd $GITHUB_WORKSPACE/..
mkdir -pv moab/bld
cd moab
git clone https://bitbucket.org/fathomteam/moab -b 5.3.0 --depth 1 --shallow-submodules
cd bld
cmake ../moab -DENABLE_HDF5=ON \
-DENABLE_PYMOAB=OFF \
-DHDF5_ROOT=$HDF5_PATH \
-DBUILD_SHARED_LIBS=ON \
-DENABLE_BLASLAPACK=OFF \
-DENABLE_FORTRAN=OFF \
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab
make
make install
# rm -rf *
# cmake ../moab -DENABLE_HDF5=ON -DHDF5_ROOT=${HDF5_PATH} \
# -DENABLE_BLASLAPACK=OFF \
# -DENABLE_FORTRAN=OFF \
# -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../moab \
# -DBUILD_SHARED_LIBS=ON
# make -j${ci_jobs}
# make install
cd ../..
rm -rf moab/moab moab/bld

- name: Build DAGMC
shell: bash -l {0}
run: |
mkdir -p $GITHUB_WORKSPACE/bld
cd $GITHUB_WORKSPACE/bld
cmake ../ -DMOAB_DIR=$GITHUB_WORKSPACE/../moab \
-DBUILD_CI_TESTS=ON \
-DBUILD_STATIC_EXE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/../dagmc
# -DDOUBLE_DOWN=${double_down} \
# -Ddd_ROOT=${double_down_install_dir}
make
make install
- name: Testing DAGMC
shell: bash -l {0}
run: |
cd $GITHUB_WORKSPACE/bld
PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test

1 change: 1 addition & 0 deletions src/dagmc/DagMC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <string.h>

#include <algorithm>
#include <array>
#include <climits>
#include <fstream>
#include <iostream>
Expand Down