diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-08 18:31:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-08 18:31:52 +0300 |
| commit | b16ede862f3e1414eee044c5a2b49017706af943 (patch) | |
| tree | 5e223816b20f02185a487224d8dcc0dbf406142d /.github | |
| parent | a301fb2876835f799317f8a011f368eaec4894d6 (diff) | |
| parent | a43b2106853b516248a2e657a28084b7d906cf5f (diff) | |
Merge branch 'develop' into marchcat/xcode-16
# Conflicts:
# .github/workflows/build.yaml
# indra/llmath/raytrace.cpp
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bfad0e467b..550dedb875 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -44,13 +44,15 @@ jobs: fi build: needs: setup + continue-on-error: ${{ matrix.experimental }} strategy: matrix: - runner: [windows-large, macos-14-xlarge, linux-large] + runner: [windows-large, macos-14-xlarge] configuration: ${{ fromJSON(needs.setup.outputs.configurations) }} + experimental: [false] include: - runner: linux-large - continue-on-error: true + experimental: true runs-on: ${{ matrix.runner }} outputs: viewer_channel: ${{ steps.build.outputs.viewer_channel }} @@ -154,7 +156,6 @@ jobs: env: AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }} RUNNER_OS: ${{ runner.os }} - continue-on-error: ${{ matrix.continue-on-error }} run: | # set up things the viewer's build.sh script expects set -x |