Update ccpp.yml
parent
6905c18363
commit
8c5907ae8d
|
@ -35,15 +35,6 @@ jobs:
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
cxx: g++
|
cxx: g++
|
||||||
cc: gcc
|
cc: gcc
|
||||||
#- name: ubuntu-gcc-hunter
|
|
||||||
# os: ubuntu-latest
|
|
||||||
# toolchain: ninja-gcc-cxx17-fpic
|
|
||||||
#- name: macos-clang-hunter
|
|
||||||
# os: macos-latest
|
|
||||||
# toolchain: ninja-clang-cxx17-fpic
|
|
||||||
#- name: windows-msvc-hunter
|
|
||||||
# os: windows-latest
|
|
||||||
# toolchain: ninja-vs-win64-cxx17
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -55,25 +46,11 @@ jobs:
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
|
|
||||||
- name: Set Compiler Environment
|
- name: Set Compiler Environment
|
||||||
if: "!endsWith(matrix.name, 'hunter')"
|
|
||||||
uses: lukka/set-shell-env@v1
|
uses: lukka/set-shell-env@v1
|
||||||
with:
|
with:
|
||||||
CXX: ${{ matrix.cxx }}
|
CXX: ${{ matrix.cxx }}
|
||||||
CC: ${{ matrix.cc }}
|
CC: ${{ matrix.cc }}
|
||||||
|
|
||||||
- name: Set Compiler Environment for Hunter on Windows
|
|
||||||
if: startsWith(matrix.name, 'windows') && endsWith(matrix.name, 'hunter')
|
|
||||||
uses: lukka/set-shell-env@v1
|
|
||||||
with:
|
|
||||||
VS160COMNTOOLS: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools
|
|
||||||
|
|
||||||
- name: Checkout Hunter toolchains
|
|
||||||
if: endsWith(matrix.name, 'hunter')
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
repository: cpp-pm/polly
|
|
||||||
path: cmake/polly
|
|
||||||
|
|
||||||
- name: Cache DX SDK
|
- name: Cache DX SDK
|
||||||
id: dxcache
|
id: dxcache
|
||||||
if: contains(matrix.name, 'windows')
|
if: contains(matrix.name, 'windows')
|
||||||
|
@ -95,11 +72,6 @@ jobs:
|
||||||
id: windows_extra_cmake_args
|
id: windows_extra_cmake_args
|
||||||
run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1"
|
run: echo "::set-output name=args::-DASSIMP_BUILD_ASSIMP_TOOLS=1 -DASSIMP_BUILD_ASSIMP_VIEW=1 -DASSIMP_BUILD_ZLIB=1"
|
||||||
|
|
||||||
- name: Set Hunter specific CMake arguments
|
|
||||||
if: contains(matrix.name, 'hunter')
|
|
||||||
id: hunter_extra_cmake_args
|
|
||||||
run: echo "::set-output name=args::-DBUILD_SHARED_LIBS=OFF -DASSIMP_HUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/cmake/polly/${{ matrix.toolchain }}.cmake"
|
|
||||||
|
|
||||||
- name: configure and build
|
- name: configure and build
|
||||||
uses: lukka/run-cmake@v3
|
uses: lukka/run-cmake@v3
|
||||||
env:
|
env:
|
||||||
|
@ -112,11 +84,6 @@ jobs:
|
||||||
buildWithCMakeArgs: '--parallel 24 -v'
|
buildWithCMakeArgs: '--parallel 24 -v'
|
||||||
buildDirectory: '${{ github.workspace }}/build/'
|
buildDirectory: '${{ github.workspace }}/build/'
|
||||||
|
|
||||||
- name: Exclude certain tests in Hunter specific builds
|
|
||||||
if: contains(matrix.name, 'hunter')
|
|
||||||
id: hunter_extra_test_args
|
|
||||||
run: echo "::set-output name=args::--gtest_filter=-utOpenGEXImportExport.Importissue1340_EmptyCameraObject:utColladaZaeImportExport.importBlenFromFileTest"
|
|
||||||
|
|
||||||
- name: test
|
- name: test
|
||||||
run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
|
run: cd build/bin && ./unit ${{ steps.hunter_extra_test_args.outputs.args }}
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
Loading…
Reference in New Issue