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

Redo of previous #353

Merged
merged 9 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions .github/workflows/publish_matlab_binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,19 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true

- name: Print mamba info
- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install dependencies
run: |
mamba install cmake git pkgconfig -cconda-forge
mamba list
conda install cmake git pkgconfig -cconda-forge
conda list
git submodule update --init --recursive

- name: Install MATLAB on WINDOWS, LINUX and MACOS-Intel
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/publish_to_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,21 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
activate-environment: ezc3d
environment-file: environment.yml

- name: Print mamba info
- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install build packages
run: |
mamba install python pip -cconda-forge
mamba list
conda install python pip -cconda-forge
conda list
pip install build cibuildwheel==2.21.3

- name: Build wheels
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/run_codecoverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,21 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
activate-environment: ezc3d
environment-file: environment.yml

- name: Print mamba info
- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install code coverage dependencies
run: |
mamba install cmake git pkgconfig codecov lcov -cconda-forge
mamba list
conda install cmake git pkgconfig codecov lcov -cconda-forge
conda list
git submodule update --init --recursive

- name: Perform code coverage
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/run_matlab_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,19 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true

- name: Print mamba info

- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install dependencies
run: |
mamba install cmake git pkgconfig -cconda-forge
mamba list
conda install cmake git pkgconfig -cconda-forge
conda list
git submodule update --init --recursive

- name: Install MATLAB on WINDOWS and LINUX
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/run_octave_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,19 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true

- name: Print mamba info

- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install dependencies
run: |
mamba install cmake git pkgconfig octave -cconda-forge
mamba list
conda install cmake git pkgconfig octave -cconda-forge
conda list
git submodule update --init --recursive

- name: Build ezc3d
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,21 @@ jobs:
id: cpu-cores

- name: Setup environment
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
miniforge-version: latest
use-mamba: true
activate-environment: ezc3d
environment-file: environment.yml

- name: Print mamba info
- name: Print conda info
run: |
mamba info
mamba list
conda info
conda list

- name: Install extra common dependencies
run: |
mamba install cmake git pkgconfig swig numpy pytest -cconda-forge
mamba list
conda install cmake git pkgconfig swig numpy pytest -cconda-forge
conda list
git submodule update --init --recursive

- name: Build ezc3d UNIX
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(ezc3d VERSION 1.5.17)
project(ezc3d VERSION 1.5.18)

option(BUILD_SHARED_LIBS "Choose if build should be a dynamic or static library" ON)
# Option to allow checking of size for matrix getter (slower but safer if activated)
Expand Down
3 changes: 0 additions & 3 deletions binding/python3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
if(POLICY CMP0078)
cmake_policy(SET CMP0078 NEW)
endif()
if(POLICY CMP0086)
cmake_policy(SET CMP0086 OLD)
endif()

if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13")
project(_${EZC3D_NAME})
Expand Down
Loading
Loading