diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/CODEOWNERS | 4 | ||||
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 12 | ||||
| -rw-r--r-- | .github/actions/godot-build/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/javascript_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux_builds.yml | 26 | ||||
| -rw-r--r-- | .github/workflows/macos_builds.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/static_checks.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows_builds.yml | 2 |
9 files changed, 37 insertions, 23 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ebbbe345fd..e7e88e95d7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -139,10 +139,10 @@ doc_classes/* @godotengine/documentation # Platform /platform/android/ @godotengine/android -/platform/iphone/ @godotengine/ios +/platform/ios/ @godotengine/ios /platform/javascript/ @godotengine/html5 /platform/linuxbsd/ @godotengine/linux-bsd -/platform/osx/ @godotengine/macos +/platform/macos/ @godotengine/macos /platform/uwp/ @godotengine/uwp /platform/windows/ @godotengine/windows 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/actions/godot-build/action.yml b/.github/actions/godot-build/action.yml index 7af3516f71..75f3d9ab37 100644 --- a/.github/actions/godot-build/action.yml +++ b/.github/actions/godot-build/action.yml @@ -35,5 +35,5 @@ runs: run: | echo "Building with flags:" ${{ env.SCONSFLAGS }} if ! ${{ inputs.tools }}; then rm -rf editor; fi # Ensure we don't include editor code. - scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} --jobs=2 ${{ env.SCONSFLAGS }} + scons p=${{ inputs.platform }} target=${{ inputs.target }} tools=${{ inputs.tools }} tests=${{ inputs.tests }} ${{ env.SCONSFLAGS }} ls -l bin/ diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml index 40f091e234..03277edc1d 100644 --- a/.github/workflows/ios_builds.yml +++ b/.github/workflows/ios_builds.yml @@ -30,7 +30,7 @@ jobs: uses: ./.github/actions/godot-build with: sconsflags: ${{ env.SCONSFLAGS }} - platform: iphone + platform: ios target: release tools: false tests: false diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml index 395dfdd7f5..00c79e8ba0 100644 --- a/.github/workflows/javascript_builds.yml +++ b/.github/workflows/javascript_builds.yml @@ -6,7 +6,7 @@ env: # Only used for the cache key. Increment version to force clean build. GODOT_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no - EM_VERSION: 2.0.27 + EM_VERSION: 3.1.10 EM_CACHE_FOLDER: "emsdk-cache" concurrency: diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index 7ac364c45f..82e5843416 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -28,14 +28,15 @@ jobs: doc-test: true bin: "./bin/godot.linuxbsd.opt.tools.64.mono" build-mono: true + proj-conv: true artifact: true - - name: Editor with doubles and GCC sanitizers (target=debug, tools=yes, float=64, tests=yes, use_asan=yes, use_ubsan=yes) + - name: Editor with doubles and GCC sanitizers (target=debug, tools=yes, float=64, tests=yes, use_asan=yes, use_ubsan=yes, ld.gold) cache-name: linux-editor-double-sanitizers target: debug tools: true tests: true - sconsflags: float=64 use_asan=yes use_ubsan=yes + sconsflags: float=64 use_asan=yes use_ubsan=yes LINKFLAGS="-fuse-ld=gold" proj-test: true # Can be turned off for PRs that intentionally break compat with godot-cpp, # until both the upstream PR and the matching godot-cpp changes are merged. @@ -45,12 +46,12 @@ jobs: # Skip 2GiB artifact speeding up action. artifact: false - - name: Editor with clang sanitizers (target=debug, tools=yes, use_asan=yes, use_ubsan=yes, use_llvm=yes) + - name: Editor with clang sanitizers (target=debug, tools=yes, use_asan=yes, use_ubsan=yes, use_llvm=yes, use_lld=yes) cache-name: linux-editor-llvm-sanitizers target: debug tools: true tests: true - sconsflags: use_asan=yes use_ubsan=yes use_llvm=yes + sconsflags: use_asan=yes use_ubsan=yes use_llvm=yes use_lld=yes bin: "./bin/godot.linuxbsd.tools.64.llvm.san" build-mono: false # Skip 2GiB artifact speeding up action. @@ -87,7 +88,7 @@ jobs: sudo apt-get install build-essential pkg-config libx11-dev libxcursor-dev \ libxinerama-dev libgl1-mesa-dev libglu-dev libasound2-dev libpulse-dev \ libdbus-1-dev libudev-dev libxi-dev libxrandr-dev yasm xvfb wget unzip \ - llvm + llvm libspeechd-dev speech-dispatcher - name: Setup Godot build cache uses: ./.github/actions/godot-cache @@ -126,6 +127,8 @@ jobs: - name: Unit tests if: ${{ matrix.tests }} run: | + ${{ matrix.bin }} --version + ${{ matrix.bin }} --help ${{ matrix.bin }} --test --headless # Check class reference @@ -147,6 +150,17 @@ jobs: curr="$(pwd)/libvk_swiftshader.so" sed -i "s|PATH_TO_CHANGE|$curr|" vk_swiftshader_icd.json + # Test 3.x -> 4.x project converter + - name: Test project converter + if: ${{ matrix.proj-conv }} + run: | + mkdir converter_test + cd converter_test + touch project.godot + ../${{ matrix.bin }} --headless --audio-driver Dummy --validate-conversion-3to4 + cd .. + rm converter_test -rf + # Download and extract zip archive with project, folder is renamed to be able to easy change used project - name: Download test project if: ${{ matrix.proj-test }} @@ -198,7 +212,7 @@ jobs: if: ${{ matrix.godot-cpp-test }} run: | cd godot-cpp/test - scons target=${{ matrix.target }} -j2 + scons target=${{ matrix.target }} cd ../.. - name: Prepare artifact diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index 68623f2770..0cb037bfae 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 @@ -24,7 +24,7 @@ jobs: target: release_debug tools: true tests: true - bin: "./bin/godot.osx.opt.tools.64" + bin: "./bin/godot.macos.opt.tools.64" - name: Template (target=release, tools=no) cache-name: macos-template @@ -49,7 +49,7 @@ jobs: uses: ./.github/actions/godot-build with: sconsflags: ${{ env.SCONSFLAGS }} - platform: osx + platform: macos target: ${{ matrix.target }} tools: ${{ matrix.tools }} tests: ${{ matrix.tests }} @@ -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/static_checks.yml b/.github/workflows/static_checks.yml index 5531509007..d7d07b7022 100644 --- a/.github/workflows/static_checks.yml +++ b/.github/workflows/static_checks.yml @@ -54,4 +54,4 @@ jobs: - name: Documentation checks run: | - doc/tools/make_rst.py --dry-run doc/classes modules + doc/tools/make_rst.py --dry-run --color doc/classes modules 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 |