Skip to content

Commit b1d1a19

Browse files
committed
Merge remote-tracking branch 'origin/main' into main
2 parents ffdb25e + 48d4af3 commit b1d1a19

File tree

3 files changed

+9
-32
lines changed

3 files changed

+9
-32
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ defaults:
1414

1515

1616
jobs:
17-
build-packages:
17+
build:
1818
runs-on: ${{ matrix.os }}
1919
strategy:
2020
matrix:
21-
os: [macos-latest, windows-latest, ubuntu-latest]
21+
os: [macos-latest, windows-latest]
2222
python-version: [3.7, 3.8, 3.9]
2323

2424
steps:
@@ -28,35 +28,10 @@ jobs:
2828
- uses: conda-incubator/[email protected]
2929
with:
3030
miniconda-version: "latest"
31-
activate-environment: cgal
3231
channels: conda-forge
32+
python-version: ${{ matrix.python-version }}
3333

34-
- name: build (linux)
35-
if: matrix.os == 'ubuntu-latest'
36-
run: |
37-
conda install eigen=3.3 boost-cpp gmp mpfr cgal-cpp=5.2 pybind11 compas -y
38-
pip install -r requirements-dev.txt
39-
40-
- name: build (mac)
41-
if: matrix.os == 'macos-latest'
42-
run: |
43-
conda install eigen=3.3 boost-cpp gmp mpfr cgal-cpp=5.2 pybind11 compas -y
44-
pip install -r requirements-dev.txt
45-
46-
- name: build (windows)
47-
if: matrix.os == 'windows-latest'
48-
run: |
49-
conda install eigen=3.3 boost-cpp mpir mpfr cgal-cpp=5.2 pybind11 compas -y
50-
pip install -r requirements-dev.txt
51-
52-
- name: Lint with flake8
53-
run: |
54-
invoke lint
55-
56-
- name: Test with pytest
57-
run: |
58-
invoke test
59-
60-
- name: Test build docs
61-
run: |
62-
invoke docs
34+
- uses: compas-dev/[email protected]
35+
with:
36+
test_lint: true
37+
test_compas: true

env_osx.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ dependencies:
1010
- eigen=3.3
1111
- cgal-cpp=5.2
1212
- pybind11
13+
- compas
1314
- pip:
1415
- -r requirements-dev.txt

env_win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ dependencies:
1010
- eigen=3.3
1111
- cgal-cpp=5.2
1212
- pybind11
13+
- compas
1314
- pip:
1415
- -r requirements-dev.txt

0 commit comments

Comments
 (0)