ci: Reduce CI to unblock Github Action minutes #1217
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ jobs: | |
| name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| strategy: | ||
| matrix: | ||
| platform: [windows, ubuntu] | ||
| build_type: [Debug, Release] | ||
| env: | ||
| PARALLEL: -j 2 | ||
|
|
@@ -55,6 +55,63 @@ jobs: | |
| cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON | ||
| cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }} | ||
|
|
||
| build_v2: | ||
| name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| strategy: | ||
| matrix: | ||
| platform: [windows, ubuntu] | ||
| build_type: [Release] | ||
| env: | ||
| PARALLEL: -j 2 | ||
| runs-on: "${{ matrix.platform }}-latest" | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: "recursive" | ||
|
|
||
| - if: ${{ matrix.platform == 'ubuntu' }} | ||
| name: Install RandR headers | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt install xorg-dev libglu1-mesa-dev | ||
|
|
||
| - name: Configure | ||
| run: cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON | ||
|
|
||
| - name: "Build Components ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| run: cmake --build "build/${{ matrix.platform }}" --target vkb__components --config ${{ matrix.build_type }} ${{ env.PARALLEL }} | ||
|
|
||
| - name: "Build Tests ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| run: cmake --build "build/${{ matrix.platform }}" --target vkb__tests --config ${{ matrix.build_type }} ${{ env.PARALLEL }} | ||
|
|
||
| - name: "Run Tests ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| run: ctest -C ${{ matrix.build_type }} --test-dir "build/${{ matrix.platform }}" --output-on-failure | ||
|
|
||
| build_macos: | ||
| needs: build | ||
| name: "Build ${{ matrix.platform }} in ${{ matrix.build_type }}" | ||
| strategy: | ||
| # masoc is 10x expensive to run on GitHub machines, so only build simplest variations | ||
| matrix: | ||
| platform: [macos] | ||
| # Release builds are about 3 times faster than debug builds | ||
| build_type: [Release] | ||
| env: | ||
| PARALLEL: -j 2 | ||
| runs-on: "${{ matrix.platform }}-latest" | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: "recursive" | ||
| - name: ccache | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| key: ${{ github.job }}-${{ matrix.os }} | ||
| - name: Configure and build | ||
| run: | | ||
| cmake -B"build/${{ matrix.platform }}" -DVKB_BUILD_TESTS=ON -DVKB_BUILD_SAMPLES=ON | ||
| cmake --build "build/${{ matrix.platform }}" --target vulkan_samples --config ${{ matrix.build_type }} ${{ env.PARALLEL }} | ||
|
|
||
| build_d2d: | ||
| name: "Build Ubuntu with Direct To Display" | ||
| env: | ||
|
|
@@ -108,11 +165,13 @@ jobs: | |
| run: NDK_CCACHE=1 NDK_CCACHE_BIN=ccache ./gradlew app:assemble${{ matrix.build_type }} --info | ||
|
|
||
| build_ios: | ||
| # iOS is 10x expensive to run on GitHub machines, so only run if we know something else fast/simple passed as well | ||
| needs: build | ||
|
There was a problem hiding this comment. how this looks in practice
There was a problem hiding this comment. We could potentially move IOS to only run on main as well (see below for macos comment) There was a problem hiding this comment.
Wouldn't that cause problems for PRs? How would people know if their changes would break iOS/Mac? There was a problem hiding this comment. I think changing from Debug to Release will help a lot of build times. Also just making sure we are not running it unless others are passing is huge... so ya, maybe worth just keeping it for now |
||
| name: "Build ios in ${{ matrix.build_type }}" | ||
| runs-on: macos-latest | ||
| strategy: | ||
| matrix: | ||
| build_type: [Release] | ||
|
There was a problem hiding this comment. Release builds are about 3 times faster, this build is currently around 20+ minutes and should reduce it greatly |
||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any chance we can keep MacOS once merged?
Keep it in the matrix but add an if statement to the job to only run macos on main
Not sure what this would be in practice but something like
if !macos or ( macos and branch == main )There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could follow with a PR to add this if it becomes an issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking that, but wasn't sure what people would think, @tomadamatkinson could you make a seperate PR with how you would do it, I think you probably know what you want better, this PR was more of a "here is a way to improve things"