oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/olive-editor/olive

Browse Source
This commit is contained in:
itsmattkc
2021-03-25 14:51:12 +11:00
parent 9b58acc224 cc317a8b1a
commit f72dbc4714
16 changed files with 115 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+2 -14
View File
@@ -36,28 +36,20 @@ jobs:
compiler-name: GCC 9.3.1
cmake-gen: Ninja
os-name: Linux (CentOS 7)
vfx-cy: 2021
ci-common-version: 2
- build-type: RelWithDebInfo
cc-compiler: clang
cxx-compiler: clang++
compiler-name: Clang 10.0.0
cmake-gen: Ninja
os-name: Linux (CentOS 7)
vfx-cy: 2021
ci-common-version: 2
name: |
${{ matrix.os-name }}
<${{ matrix.compiler-name }},
${{ matrix.build-type }},
${{ matrix.cmake-gen }},
VFX CY${{ matrix.vfx-cy }},
CI Common Version ${{ matrix.ci-common-version }}>
${{ matrix.cmake-gen }}>
runs-on: ubuntu-latest
container:
image: olivevideoeditor/ci-olive:${{ matrix.vfx-cy }}.${{ matrix.ci-common-version }}
if: >-
!contains(github.event.head_commit.message, '[skip ci]')
image: olivevideoeditor/ci-olive:2021.3
steps:
- name: Checkout Source Code
@@ -138,8 +130,6 @@ jobs:
${{ matrix.build-type }},
${{ matrix.cmake-gen }}>
runs-on: ${{ matrix.os }}
if: >-
!contains(github.event.head_commit.message, '[skip ci]')
steps:
- name: Checkout Source Code
@@ -284,8 +274,6 @@ jobs:
${{ matrix.build-type }},
${{ matrix.cmake-gen }}>
runs-on: ${{ matrix.os }}
if: >-
!contains(github.event.head_commit.message, '[skip ci]')
steps:
- name: Checkout Source Code