Skip to content

Commit

Permalink
clean up CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Meakk committed Jun 15, 2023
1 parent 2e94057 commit b52695c
Show file tree
Hide file tree
Showing 10 changed files with 2,209 additions and 21 deletions.
60 changes: 60 additions & 0 deletions .github/actions/boost-install-dep/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: 'Install Boost Dependency'
description: 'Install Boost Dependency using cache when possible'

runs:
using: "composite"
steps:

- name: Cache Boost
id: cache-boost
uses: actions/cache@v3
with:
path: dependencies/boost_install
key: boost-1.82.0-${{runner.os}}-0

- name: Checkout Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: boostorg/boost
submodules: true
fetch-depth: 0
path: './dependencies/boost'
ref: boost-1.82.0

- name: Setup Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies
shell: bash
run: |
mkdir boost_build
mkdir boost_install
- name: Configure Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/boost
shell: bash
run: ./bootstrap.sh

- name: Build Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/boost
shell: bash
run: >
./b2
--prefix='../boost_install'
--build-dir='../boost_build'
variant='release'
link=static
runtime-link=shared
--with-date_time
--with-filesystem
--with-program_options
--with-regex
--with-system
install
- name: Copy to install
working-directory: ${{github.workspace}}/dependencies/boost_install
shell: bash
run: cp -r ./* ../install/
4 changes: 3 additions & 1 deletion .github/actions/f3d-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ runs:
- name: Install pybind11 dependency
uses: ./source/.github/actions/pybind11-install-dep

- name: Install Boost dependency
uses: ./source/.github/actions/boost-install-dep

- name: Install USD dependency
uses: ./source/.github/actions/usd-install-dep
if: runner.os == 'Linux'
2 changes: 1 addition & 1 deletion .github/actions/lfs-copy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ runs:
uses: actions/cache@v3
with:
path: lfs_data
key: lfs-data-${{inputs.lfs_sha}}-1
key: lfs-data-${{inputs.lfs_sha}}-13

- name: Checkout LFS data
if: |
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/ospray-sb-install-dep/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ name: 'Install ospray sb Dependency'
description: 'Install ospray sb Dependency using cache when possible'
runs:
using: "composite"

steps:

- name: Cache ospray
id: cache-ospray
uses: actions/cache@v3
with:
path: dependencies/ospray_install
key: ospray-sb-v2.7.1-${{runner.os}}-2
key: ospray-sb-v2.7.1-${{runner.os}}-3

- name: Checkout ospray
if: steps.cache-ospray.outputs.cache-hit != 'true'
Expand All @@ -34,7 +35,6 @@ runs:
mkdir ospray_build
mkdir ospray_install
# TBB system is used for Linux to use the version previous to oneAPI switch for USD compatibility
- name: Configure ospray
if: steps.cache-ospray.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/ospray_build
Expand All @@ -49,7 +49,7 @@ runs:
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX:PATH=../ospray_install
-DDOWNLOAD_ISPC=ON
-DDOWNLOAD_TBB=${{ runner.os == 'Linux' && 'OFF' || 'ON' }}
-DDOWNLOAD_TBB=OFF
-DINSTALL_DEPENDENCIES=ON
-DINSTALL_IN_SEPARATE_DIRECTORIES=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }}
Expand Down
55 changes: 55 additions & 0 deletions .github/actions/tbb-install-dep/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: 'Install TBB Dependency'
description: 'Install TBB Dependency using cache when possible'

runs:
using: "composite"
steps:

- name: Cache TBB
id: cache-tbb
uses: actions/cache@v3
with:
path: dependencies/tbb_install
key: tbb-v2021.9.0-${{runner.os}}-2

- name: Checkout TBB
if: steps.cache-tbb.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: oneapi-src/oneTBB
path: './dependencies/tbb'
ref: v2021.9.0

- name: Setup TBB
if: steps.cache-tbb.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies
shell: bash
run: |
mkdir tbb_build
mkdir tbb_install
- name: Configure TBB
if: steps.cache-tbb.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/tbb_build
shell: bash
run: >
cmake ../tbb
-DBUILD_SHARED_LIBS=ON
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX:PATH=../tbb_install
-DTBB_STRICT=OFF
-DTBB_TEST=OFF
-DTBB4PY_BUILD=OFF
${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }}
${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }}
- name: Build TBB
if: steps.cache-tbb.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/tbb_build
shell: bash
run: cmake --build . --parallel 2 --target install --config Release

- name: Copy to install
working-directory: ${{github.workspace}}/dependencies/tbb_install
shell: bash
run: cp -r ./* ../install/
Loading

0 comments on commit b52695c

Please sign in to comment.