mirror of
https://github.com/godotengine/godot.git
synced 2024-11-13 23:52:41 +00:00
CI: Fix badly resolved merge conflict from previous PR
Some checks failed
🤖 Android Builds / Template (target=release, tools=no) (push) Has been cancelled
🍏 iOS Builds / Template (target=release, tools=no) (push) Has been cancelled
🌐 JavaScript Builds / Template (target=release, tools=no) (push) Has been cancelled
🐧 Linux Builds / Editor w/ Mono (target=release_debug, tools=yes) (push) Has been cancelled
🐧 Linux Builds / Template w/ Mono (target=release, tools=no) (push) Has been cancelled
🐧 Linux Builds / Editor and exported project with sanitizers (target=debug/release, tools=yes/no, use_ubsan=yes, use_asan=yes) (push) Has been cancelled
🍎 macOS Builds / Editor (target=release_debug, tools=yes) (push) Has been cancelled
🍎 macOS Builds / Template (target=release, tools=no) (push) Has been cancelled
☁ Server Builds / Linux Headless w/ Mono (target=release_debug, tools=yes) (push) Has been cancelled
☁ Server Builds / Linux Server w/ Mono (target=release, tools=no) (push) Has been cancelled
📊 Static Checks / Static Checks (clang-format, black format, file format, documentation checks) (push) Has been cancelled
🏁 Windows Builds / Editor (target=release_debug, tools=yes) (push) Has been cancelled
🏁 Windows Builds / Template (target=release, tools=no) (push) Has been cancelled
Some checks failed
🤖 Android Builds / Template (target=release, tools=no) (push) Has been cancelled
🍏 iOS Builds / Template (target=release, tools=no) (push) Has been cancelled
🌐 JavaScript Builds / Template (target=release, tools=no) (push) Has been cancelled
🐧 Linux Builds / Editor w/ Mono (target=release_debug, tools=yes) (push) Has been cancelled
🐧 Linux Builds / Template w/ Mono (target=release, tools=no) (push) Has been cancelled
🐧 Linux Builds / Editor and exported project with sanitizers (target=debug/release, tools=yes/no, use_ubsan=yes, use_asan=yes) (push) Has been cancelled
🍎 macOS Builds / Editor (target=release_debug, tools=yes) (push) Has been cancelled
🍎 macOS Builds / Template (target=release, tools=no) (push) Has been cancelled
☁ Server Builds / Linux Headless w/ Mono (target=release_debug, tools=yes) (push) Has been cancelled
☁ Server Builds / Linux Server w/ Mono (target=release, tools=no) (push) Has been cancelled
📊 Static Checks / Static Checks (clang-format, black format, file format, documentation checks) (push) Has been cancelled
🏁 Windows Builds / Editor (target=release_debug, tools=yes) (push) Has been cancelled
🏁 Windows Builds / Template (target=release, tools=no) (push) Has been cancelled
This commit is contained in:
parent
01bf239576
commit
69962b74af
4
.github/workflows/windows_builds.yml
vendored
4
.github/workflows/windows_builds.yml
vendored
@ -18,11 +18,7 @@ jobs:
|
|||||||
name: Editor (target=release_debug, tools=yes)
|
name: Editor (target=release_debug, tools=yes)
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
<<<<<<< HEAD
|
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
=======
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
>>>>>>> 6b202812ff (CI: Update all GitHub actions to their latest version)
|
|
||||||
|
|
||||||
# Upload cache on completion and check it out now
|
# Upload cache on completion and check it out now
|
||||||
# Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
|
# Editing this is pretty dangerous for Windows since it can break and needs to be properly tested with a fresh cache.
|
||||||
|
Loading…
Reference in New Issue
Block a user