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

CI: Downgrade ubuntu runner #253

Merged
merged 4 commits into from
Feb 14, 2025
Merged

CI: Downgrade ubuntu runner #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29b516e
CI: Downgrade ubuntu runner
nikitalita Feb 12, 2025
18dfd9b
resync @ 23c1389f92b090bf1fdc324988244a55c1568214
nikitalita Feb 12, 2025
64f6a0c
fix linking error on linux
nikitalita Feb 13, 2025
9fed9c5
Update README.md
nikitalita Feb 14, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/all_builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
env:
GODOT_BASE_BRANCH: master
# Change the README too
GODOT_MAIN_SYNC_REF: 99a8ab795d65e816ea7c452aa0fb55d02385c048
GODOT_MAIN_SYNC_REF: 23c1389f92b090bf1fdc324988244a55c1568214
SCONSFLAGS: verbose=yes warnings=all werror=no module_text_server_fb_enabled=yes minizip=yes deprecated=yes
SCONSFLAGS_TEMPLATE: no_editor_splash=yes module_camera_enabled=no module_mobile_vr_enabled=no module_upnp_enabled=no module_websocket_enabled=no module_csg_enabled=yes module_gridmap_enabled=yes use_static_cpp=yes builtin_freetype=yes builtin_libpng=yes builtin_zlib=yes builtin_libwebp=yes builtin_libvorbis=yes builtin_libogg=yes disable_3d=no
SCONS_CACHE_MSVC_CONFIG: true
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
bin: ./bin/godot.windows.editor.x86_64.exe

- name: "🐧 Linux Editor"
os: "ubuntu-24.04"
os: "ubuntu-22.04"
id: linux-editor
platform: linux
target: editor
Expand All @@ -79,7 +79,7 @@ jobs:
# bin: ./bin/godot.linuxbsd.editor.x86_64.san

- name: "🐧 Linux Template Release"
os: "ubuntu-24.04"
os: "ubuntu-22.04"
id: linux-template
platform: linux
target: template_release
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ For ease of bootstrapping development, we have included launch, build, and setti

### Requirements

Godot 4.0 (master branch) @ 99a8ab795d65e816ea7c452aa0fb55d02385c048
Godot 4.0 (master branch) @ 23c1389f92b090bf1fdc324988244a55c1568214

- Support for building on 3.x has been dropped and no new features are being pushed
- Godot RE Tools still retains the ability to decompile 3.x and 2.x projects, however.
Expand Down
4 changes: 2 additions & 2 deletions compat/oggstr_loader_compat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "oggstr_loader_compat.h"
#include "core/error/error_macros.h"
#include "modules/vorbis/resource_importer_ogg_vorbis.h"
#include "modules/vorbis/audio_stream_ogg_vorbis.h"

Ref<Resource> OggStreamConverterCompat::convert(const Ref<MissingResource> &res, ResourceInfo::LoadType p_type, int ver_major, Error *r_error) {
String name = get_resource_name(res, ver_major);
Vector<uint8_t> data = res->get("data");
bool loop = res->get("loop");
double loop_offset = res->get("loop_offset");
Ref<AudioStreamOggVorbis> sample = ResourceImporterOggVorbis::load_from_buffer(data);
Ref<AudioStreamOggVorbis> sample = AudioStreamOggVorbis::load_from_buffer(data);
ERR_FAIL_COND_V_MSG(sample.is_null(), res, "Failed to load Ogg Vorbis stream from buffer.");
if (!name.is_empty()) {
sample->set_name(name);
Expand Down
Loading