Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
amock committed Nov 28, 2023
2 parents 2513adc + 703ad3f commit 1d7279b
Show file tree
Hide file tree
Showing 9 changed files with 287 additions and 15 deletions.
27 changes: 20 additions & 7 deletions .github/workflows/core-ubu20.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,25 @@ on:
branches:
- '*'
jobs:
build:
rmagine-core-ubuntu20:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install APT Deps
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev
- uses: threeal/[email protected]
- name: Build the project
run: cmake --build build
- name: Deps (core)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
cd rmagine
mkdir build
cd build
cmake ..
make
- name: Test
run: |
cd rmagine
cd build
./bin/rmagine_version
make test
27 changes: 20 additions & 7 deletions .github/workflows/core-ubu22.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,25 @@ on:
branches:
- '*'
jobs:
build:
rmagine-core-ubuntu22:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install APT Deps
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev
- uses: threeal/[email protected]
- name: Build the project
run: cmake --build build
- name: Deps (core)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
cd rmagine
mkdir build
cd build
cmake ..
make
- name: Test
run: |
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/cuda-ubu20.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: cuda-ubu20
on:
push:
branches:
- 'no'
pull_request:
branches:
- 'no'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-cuda-ubuntu20:
runs-on: ubuntu-20.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/cuda-ubu22.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: cuda-ubu22
on:
push:
branches:
- 'no'
pull_request:
branches:
- 'no'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-cuda-ubuntu22:
runs-on: ubuntu-22.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/embree-ubu20.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: embree-ubu20
on:
push:
branches:
- 'main'
pull_request:
branches:
- 'main'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-embree-ubuntu20:
runs-on: ubuntu-20.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/embree-ubu22.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: embree-ubu22
on:
push:
branches:
- 'main'
pull_request:
branches:
- 'main'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-embree-ubuntu22:
runs-on: ubuntu-22.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/optix-ubu20.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: optix-ubu20
on:
push:
branches:
- 'no'
pull_request:
branches:
- 'no'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-optix-ubuntu20:
runs-on: ubuntu-20.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
41 changes: 41 additions & 0 deletions .github/workflows/optix-ubu22.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: optix-ubu22
on:
push:
branches:
- 'no'
pull_request:
branches:
- 'no'
workflow_dispatch:
branches:
- '*'
jobs:
rmagine-optix-ubuntu22:
runs-on: ubuntu-22.04
steps:
- name: Deps (APT)
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
- name: Deps (Embree)
run: |
wget https://github.com/embree/embree/releases/download/v4.3.0/embree-4.3.0.x86_64.linux.tar.gz
mkdir embree
tar -xf embree-4.3.0.x86_64.linux.tar.gz -C embree
- name: Clone
uses: actions/checkout@v4
with:
path: rmagine
- name: Compile
run: |
. embree/embree-vars.sh
cd rmagine
mkdir build
cd build
cmake -Dembree_DIR=$PWD/../../embree/lib/cmake/embree-4.3.0/ ..
make
- name: Test
run: |
. embree/embree-vars.sh
cd rmagine
cd build
./bin/rmagine_version
make test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@ We are open to all contributions. These can be issues, pull requests or feedback
| | Ubuntu 20 | Ubuntu 22 |
|-------------------|:---------:|:---------:|
| `rmagine::core` | [![CI](https://github.com/uos/rmagine/workflows/core-ubu20/badge.svg)](https://github.com/uos/rmagine/actions/workflows/core-ubu20.yml) | [![CI](https://github.com/uos/rmagine/workflows/core-ubu22/badge.svg)](https://github.com/uos/rmagine/actions/workflows/core-ubu22.yml) |
| `rmagine::embree` | ... | ... |
| `rmagine::embree` | [![CI](https://github.com/uos/rmagine/workflows/embree-ubu20/badge.svg)](https://github.com/uos/rmagine/actions/workflows/embree-ubu20.yml) | [![CI](https://github.com/uos/rmagine/workflows/embree-ubu22/badge.svg)](https://github.com/uos/rmagine/actions/workflows/embree-ubu22.yml) |
| `rmagine::cuda` | ... | ... |
| `rmagine::optix` | ... | ... |

0 comments on commit 1d7279b

Please sign in to comment.