diff options
Diffstat (limited to '.github')
-rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 12 | ||||
-rw-r--r-- | .github/workflows/linux_builds.yml | 2 | ||||
-rw-r--r-- | .github/workflows/macos_builds.yml | 4 | ||||
-rw-r--r-- | .github/workflows/windows_builds.yml | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 332ed2b72f..8dc712c78d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,7 @@ <!-- -Pull requests should always be made for the `master` branch first, as that's -where development happens and the source of all future stable release branches. +Please target the `master` branch in priority. +PRs can target `3.x` if the same change was done in `master`, or is not relevant there. -Relevant fixes are cherry-picked for stable branches as needed. - -Do not create a pull request for stable branches unless the change is already -available in the `master` branch and it cannot be easily cherry-picked. -Alternatively, if the change is only relevant for that branch (e.g. rendering -fixes for the 3.2 branch). +Relevant fixes are cherry-picked for stable branches as needed by maintainers. +You can mention in the description if the change is compatible with `3.x`. --> diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 3df4409041..0c6a140e28 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -127,6 +127,8 @@ jobs: - name: Unit tests if: ${{ matrix.tests }} run: | + ${{ matrix.bin }} --version + ${{ matrix.bin }} --help ${{ matrix.bin }} --test --headless # Check class reference diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 68623f2770..9b8ffc45a7 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -5,7 +5,7 @@ on: [push, pull_request] env: # Only used for the cache key. Increment version to force clean build. GODOT_BASE_BRANCH: master-v3 - SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes + SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes use_volk=yes concurrency: group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-macos @@ -58,6 +58,8 @@ jobs: - name: Unit tests if: ${{ matrix.tests }} run: | + ${{ matrix.bin }} --version + ${{ matrix.bin }} --help ${{ matrix.bin }} --test - name: Prepare artifact diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 4919f34cf0..e04d49adde 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -64,6 +64,8 @@ jobs: - name: Unit tests if: ${{ matrix.tests }} run: | + ${{ matrix.bin }} --version + ${{ matrix.bin }} --help ${{ matrix.bin }} --test - name: Prepare artifact |