Skip to content

Commit 2f60ff7

Browse files
authored
Merge pull request #180 from dpilger26/v2_9_0
version 2.9.0
2 parents 0d7eb13 + 9f24852 commit 2f60ff7

File tree

1,847 files changed

+25624
-14366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,847 files changed

+25624
-14366
lines changed

.github/actions/BuildAndTest/action.yml renamed to .github/actions/BuildTestInstall/action.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: Build And Test
2-
description: "Builds the binaries and runs the tests"
1+
name: Build Test and Install
2+
description: "Builds the binaries, runs the tests, and installs the library"
33

44
inputs:
55
numcpp_no_use_boost:
@@ -11,9 +11,6 @@ inputs:
1111
boost_root:
1212
description: the root of the boost installation
1313
required: true
14-
conda_bin_dir:
15-
description: the bin dir for the conda installation
16-
required: true
1714
cxx_std_version:
1815
description: the c++ standard to use for compilation
1916
required: false
@@ -22,6 +19,10 @@ inputs:
2219
description: compile with multithread support
2320
required: false
2421
default: false
22+
sudo:
23+
description: run command with sudo
24+
required: false
25+
default: ""
2526

2627
runs:
2728
using: "composite"
@@ -32,9 +33,14 @@ runs:
3233

3334
- name: Build
3435
shell: ${{inputs.shell}}
35-
run: cmake --build ${{github.workspace}}/build --config Release
36+
run: cmake --build ${{github.workspace}}/build --config Release -j16
3637

3738
- name: Test
3839
shell: ${{inputs.shell}}
3940
working-directory: ${{github.workspace}}/test/pytest
40-
run: ${{inputs.conda_bin_dir}}/pytest
41+
run: pytest
42+
43+
- name: Install
44+
shell: ${{inputs.shell}}
45+
working-directory: ${{github.workspace}}
46+
run: ${{inputs.sudo}} cmake --build ${{github.workspace}}/build --config Release --target install

.github/actions/LinuxEnvironmentSetup/action.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,22 @@ description: "Sets up the linux environment"
44
runs:
55
using: "composite"
66
steps:
7-
- name: Set up Python 3.9
8-
uses: actions/setup-python@v3
7+
- name: Setup conda
8+
uses: conda-incubator/setup-miniconda@v2
99
with:
10+
auto-update-conda: true
11+
auto-activate-base: false
12+
activate-environment: test
13+
environment-file: test/pytest/environment.yml
1014
python-version: 3.9
1115

12-
- name: Add conda to system path
13-
shell: bash
16+
- name: Activate Env
17+
shell: bash -l {0}
1418
run: |
15-
$CONDA/bin/conda init --all
16-
17-
- name: Install dependencies
18-
shell: bash
19-
run: |
20-
$CONDA/bin/conda env update --file ${{github.workspace}}/test/pytest/environment.yml --name base
19+
conda activate test
2120
2221
- name: Install Dependency libs
23-
shell: bash
22+
shell: bash -l {0}
2423
run: |
2524
sudo apt update
26-
sudo apt install -y libtbb-dev
2725
sudo apt install -y libboost-all-dev
28-
dpkg -L libboost-system-dev

.github/actions/WindowsEnvironmentSetup/action.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ outputs:
99
runs:
1010
using: "composite"
1111
steps:
12-
- name: Set up Python 3.9
13-
uses: actions/setup-python@v3
12+
- name: Setup conda
13+
uses: conda-incubator/setup-miniconda@v2
1414
with:
15+
auto-update-conda: true
16+
auto-activate-base: false
17+
activate-environment: test
18+
environment-file: test/pytest/environment.yml
1519
python-version: 3.9
1620

17-
- name: Add conda to system path
18-
shell: pwsh
21+
- name: Activate Env
22+
shell: powershell
1923
run: |
20-
C:\Miniconda\condabin\conda.bat init --all
21-
22-
- name: Install dependencies
23-
shell: pwsh
24-
run: |
25-
C:\Miniconda\condabin\conda.bat env update --file ${{github.workspace}}/test/pytest/environment.yml --name base
24+
conda activate test
2625
2726
- name: Install boost
2827
uses: MarkusJx/[email protected]

0 commit comments

Comments
 (0)