Skip to content

Commit

Permalink
Merge pull request #180 from dpilger26/v2_9_0
Browse files Browse the repository at this point in the history
version 2.9.0
  • Loading branch information
dpilger26 authored Feb 11, 2023
2 parents 0d7eb13 + 9f24852 commit 2f60ff7
Show file tree
Hide file tree
Showing 1,847 changed files with 25,624 additions and 14,366 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build And Test
description: "Builds the binaries and runs the tests"
name: Build Test and Install
description: "Builds the binaries, runs the tests, and installs the library"

inputs:
numcpp_no_use_boost:
Expand All @@ -11,9 +11,6 @@ inputs:
boost_root:
description: the root of the boost installation
required: true
conda_bin_dir:
description: the bin dir for the conda installation
required: true
cxx_std_version:
description: the c++ standard to use for compilation
required: false
Expand All @@ -22,6 +19,10 @@ inputs:
description: compile with multithread support
required: false
default: false
sudo:
description: run command with sudo
required: false
default: ""

runs:
using: "composite"
Expand All @@ -32,9 +33,14 @@ runs:

- name: Build
shell: ${{inputs.shell}}
run: cmake --build ${{github.workspace}}/build --config Release
run: cmake --build ${{github.workspace}}/build --config Release -j16

- name: Test
shell: ${{inputs.shell}}
working-directory: ${{github.workspace}}/test/pytest
run: ${{inputs.conda_bin_dir}}/pytest
run: pytest

- name: Install
shell: ${{inputs.shell}}
working-directory: ${{github.workspace}}
run: ${{inputs.sudo}} cmake --build ${{github.workspace}}/build --config Release --target install
23 changes: 10 additions & 13 deletions .github/actions/LinuxEnvironmentSetup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,22 @@ description: "Sets up the linux environment"
runs:
using: "composite"
steps:
- name: Set up Python 3.9
uses: actions/setup-python@v3
- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
auto-activate-base: false
activate-environment: test
environment-file: test/pytest/environment.yml
python-version: 3.9

- name: Add conda to system path
shell: bash
- name: Activate Env
shell: bash -l {0}
run: |
$CONDA/bin/conda init --all
- name: Install dependencies
shell: bash
run: |
$CONDA/bin/conda env update --file ${{github.workspace}}/test/pytest/environment.yml --name base
conda activate test
- name: Install Dependency libs
shell: bash
shell: bash -l {0}
run: |
sudo apt update
sudo apt install -y libtbb-dev
sudo apt install -y libboost-all-dev
dpkg -L libboost-system-dev
19 changes: 9 additions & 10 deletions .github/actions/WindowsEnvironmentSetup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,19 @@ outputs:
runs:
using: "composite"
steps:
- name: Set up Python 3.9
uses: actions/setup-python@v3
- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
with:
auto-update-conda: true
auto-activate-base: false
activate-environment: test
environment-file: test/pytest/environment.yml
python-version: 3.9

- name: Add conda to system path
shell: pwsh
- name: Activate Env
shell: powershell
run: |
C:\Miniconda\condabin\conda.bat init --all
- name: Install dependencies
shell: pwsh
run: |
C:\Miniconda\condabin\conda.bat env update --file ${{github.workspace}}/test/pytest/environment.yml --name base
conda activate test
- name: Install boost
uses: MarkusJx/install-boost@v2.3.0
Expand Down
Loading

0 comments on commit 2f60ff7

Please sign in to comment.