Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve nightly CI #1282

Merged
merged 5 commits into from
Feb 12, 2024
Merged

Improve nightly CI #1282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5042b66
macOS arm64 nightly VTK build
mwestphal Feb 11, 2024
77f5dc2
run nightly only on f3d-app/f3d
mwestphal Feb 11, 2024
2c13296
Further fixups
mwestphal Feb 12, 2024
d8d4b07
try again
mwestphal Feb 12, 2024
d05f18e
final fixup
mwestphal Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,14 @@ jobs:
macos:
if: github.event.pull_request.draft == false
needs: cache_lfs

strategy:
fail-fast: false
matrix:
vtk_version: [commit, v9.3.0, v9.2.6]
cpu: [x86_64]
bundle_label: [no-bundle]
include:
- vtk_version: commit
bundle_label: bundle
cpu: x86_64

runs-on: macos-latest

Expand All @@ -167,7 +164,7 @@ jobs:
with:
vtk_version: ${{matrix.vtk_version}}
bundle_label: ${{matrix.bundle_label}}
cpu: ${{matrix.cpu}}
cpu: x86_64
lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}

#----------------------------------------------------------------------------
Expand All @@ -181,12 +178,10 @@ jobs:
fail-fast: false
matrix:
vtk_version: [commit, v9.3.0, v9.2.6]
cpu: [arm64]
bundle_label: [no-bundle]
include:
- vtk_version: commit
bundle_label: bundle
cpu: arm64

runs-on: macos-14

Expand All @@ -203,7 +198,7 @@ jobs:
with:
vtk_version: ${{matrix.vtk_version}}
bundle_label: ${{matrix.bundle_label}}
cpu: ${{matrix.cpu}}
cpu: arm64
lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}

#----------------------------------------------------------------------------
Expand Down
34 changes: 29 additions & 5 deletions .github/workflows/nightly_vtk_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
# Check nightly: Checkout VTK and check if the last merged commit is less than 24 hours old
#----------------------------------------------------------------------------
check_nightly:
if: github.repository == 'f3d-app/f3d'
runs-on: ubuntu-latest
name: Check nightly
outputs:
Expand Down Expand Up @@ -132,15 +133,13 @@ jobs:
lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}

#----------------------------------------------------------------------------
# MacOS CI: Build and test, cross-cpu build matrix
# MacOS CI: Build and test
#----------------------------------------------------------------------------
macos:
needs: [cache_lfs, check_nightly]
if: ${{ needs.check_nightly.outputs.should_run == 'true' }}
strategy:
fail-fast: false
matrix:
cpu: [x86_64, arm64]

runs-on: macos-latest

Expand All @@ -155,9 +154,34 @@ jobs:
- name: Generic CI
uses: ./source/.github/actions/generic-ci
with:
build_type: ${{matrix.build_type}}
vtk_version: ${{needs.check_nightly.outputs.vtk_sha}}
cpu: ${{matrix.cpu}}
cpu: x86_64
lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}

#----------------------------------------------------------------------------
# MacOS arm64 CI: Build and test
#----------------------------------------------------------------------------
macos_arm:
needs: [cache_lfs, check_nightly]
if: ${{ needs.check_nightly.outputs.should_run == 'true' }}
strategy:
fail-fast: false

runs-on: macos-14

steps:
- name: Checkout
uses: actions/checkout@v4
with:
path: 'source'
fetch-depth: 0
lfs: false

- name: Generic CI
uses: ./source/.github/actions/generic-ci
with:
vtk_version: ${{needs.check_nightly.outputs.vtk_sha}}
cpu: arm64
lfs_sha: ${{ needs.cache_lfs.outputs.lfs_sha}}

#----------------------------------------------------------------------------
Expand Down
Loading