Skip to content

Commit 420d45d

Browse files
authored
Merge pull request #9 from M2-TE/ci-merger
ci: Merged workflows via ubuntu os matrix
2 parents 21b71f9 + 087a205 commit 420d45d

6 files changed

Lines changed: 24 additions & 87 deletions

File tree

.github/workflows/core-ubu24.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: core-ubu22
1+
name: core
22
on:
33
push:
44
branches:
@@ -10,8 +10,11 @@ on:
1010
branches:
1111
- '*'
1212
jobs:
13-
rmagine-core-ubuntu22:
14-
runs-on: ubuntu-22.04
13+
build:
14+
runs-on: ${{matrix.os}}
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
1518
steps:
1619
- name: Deps (core)
1720
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: optix-ubu22
1+
name: cuda
22
on:
33
push:
44
branches:
@@ -10,8 +10,11 @@ on:
1010
branches:
1111
- '*'
1212
jobs:
13-
rmagine-optix-ubuntu22:
14-
runs-on: ubuntu-22.04
13+
build:
14+
runs-on: ${{matrix.os}}
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-20.04, ubuntu-22.04 ]
1518
steps:
1619
- name: Deps (APT)
1720
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake

.github/workflows/embree-ubu22.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: embree-ubu24
1+
name: embree
22
on:
33
push:
44
branches:
@@ -10,8 +10,11 @@ on:
1010
branches:
1111
- '*'
1212
jobs:
13-
rmagine-embree-ubuntu22:
14-
runs-on: ubuntu-24.04
13+
build:
14+
runs-on: ${{matrix.os}}
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
1518
steps:
1619
- name: Deps (APT)
1720
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: cuda-ubu22
1+
name: optix
22
on:
33
push:
44
branches:
@@ -10,8 +10,11 @@ on:
1010
branches:
1111
- '*'
1212
jobs:
13-
rmagine-cuda-ubuntu22:
14-
runs-on: ubuntu-22.04
13+
build:
14+
runs-on: ${{matrix.os}}
15+
strategy:
16+
matrix:
17+
os: [ ubuntu-20.04, ubuntu-22.04 ]
1518
steps:
1619
- name: Deps (APT)
1720
run: sudo apt install -y libboost-dev libeigen3-dev libassimp-dev cmake

0 commit comments

Comments
 (0)