sync mac 0x (#1071)

* Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * [no ci] appimages are deprecated * deploy even if they fail to build * Branch Sync * Branch Sync * Branch Sync * Branch Sync * Branch Sync * [no ci] Fix nightly updates after AppImage Deprecation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
minecraft-linux · Dec 4, 2024 · 43c36b5 · 43c36b5
1 parent 4101034
commit 43c36b5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/branch_sync.yml b/.github/workflows/branch_sync.yml
@@ -88,7 +88,7 @@ jobs:
           }
         }
   deploy:
-    if: needs.prepare.outputs.sync == 'true' && !failure() && !cancelled()
+    if: needs.prepare.outputs.sync == 'true' && !failure('macOS', 'linux-pkg') && !cancelled()
     needs:
     - prepare
     - linux-AppImage
@@ -120,7 +120,8 @@ jobs:
       shell: bash
   publish:
     needs: deploy
-    if: needs.prepare.outputs.sync == 'true' && !failure() && !cancelled()
+    # this should also run if linux packages fail, since we don't upload those anyway
+    if: needs.prepare.outputs.sync == 'true' && !failure('macOS') && !cancelled()
     permissions: write-all
     runs-on: ubuntu-latest
     env:

diff --git a/imgui b/imgui
diff --git a/libc-shim b/libc-shim
diff --git a/mcpelauncher-client b/mcpelauncher-client
diff --git a/mcpelauncher-core b/mcpelauncher-core
diff --git a/sdl3 b/sdl3
+2 −1		backends/imgui_impl_allegro5.cpp
+1 −1		backends/imgui_impl_allegro5.h
+1 −1		backends/imgui_impl_android.cpp
+1 −1		backends/imgui_impl_android.h
+1 −1		backends/imgui_impl_dx10.h
+27 −15		backends/imgui_impl_dx11.cpp
+1 −1		backends/imgui_impl_dx11.h
+92 −23		backends/imgui_impl_dx12.cpp
+33 −12		backends/imgui_impl_dx12.h
+39 −36		backends/imgui_impl_dx9.cpp
+2 −1		backends/imgui_impl_glfw.cpp
+1 −1		backends/imgui_impl_glfw.h
+1 −1		backends/imgui_impl_glut.cpp
+1 −1		backends/imgui_impl_glut.h
+1 −1		backends/imgui_impl_metal.mm
+9 −4		backends/imgui_impl_opengl3.cpp
+1 −1		backends/imgui_impl_osx.h
+3 −2		backends/imgui_impl_osx.mm
+5 −3		backends/imgui_impl_sdl2.cpp
+1 −1		backends/imgui_impl_sdl2.h
+3 −4		backends/imgui_impl_sdl3.cpp
+1 −1		backends/imgui_impl_sdl3.h
+86 −59		backends/imgui_impl_vulkan.cpp
+12 −4		backends/imgui_impl_vulkan.h
+18 −0		backends/imgui_impl_wgpu.cpp
+1 −1		backends/imgui_impl_wgpu.h
+66 −59		backends/imgui_impl_win32.cpp
+1 −1		backends/imgui_impl_win32.h
+664 −268		docs/CHANGELOG.txt
+2 −3		docs/TODO.txt
+1 −1		examples/example_android_opengl3/main.cpp
+3 −0		examples/example_glfw_opengl3/Makefile.emscripten
+2 −1		examples/example_glfw_vulkan/build_win64.bat
+3 −0		examples/example_glfw_wgpu/Makefile.emscripten
+3 −0		examples/example_sdl2_opengl3/Makefile.emscripten
+4 −0		examples/example_sdl2_vulkan/build_win32.bat
+14 −0		examples/example_sdl2_vulkan/build_win64.bat
+3 −0		examples/example_sdl3_opengl3/Makefile.emscripten
+7 −1		examples/example_sdl3_opengl3/build_win32.bat
+14 −0		examples/example_sdl3_opengl3/build_win64.bat
+14 −0		examples/example_sdl3_vulkan/build_win32.bat
+14 −0		examples/example_sdl3_vulkan/build_win64.bat
+190 −0		examples/example_sdl3_vulkan/example_sdl3_vulkan.vcxproj
+64 −0		examples/example_sdl3_vulkan/example_sdl3_vulkan.vcxproj.filters
+587 −0		examples/example_sdl3_vulkan/main.cpp
+79 −23		examples/example_win32_directx12/main.cpp
+10 −0		examples/imgui_examples.sln
+1 −1		imconfig.h
+244 −314		imgui.cpp
+81 −90		imgui.h
+35 −24		imgui_demo.cpp
+290 −170		imgui_draw.cpp
+86 −53		imgui_internal.h
+5 −3		imgui_tables.cpp
+120 −110		imgui_widgets.cpp
+51 −15		misc/fonts/binary_to_compressed_c.cpp
+9 −5		misc/freetype/imgui_freetype.cpp
+3 −0		include/libc_shim.h
+15 −4		src/common.cpp
+18 −4		src/errno.h
+2 −2		src/file_misc.cpp
+37 −19		src/network.cpp
+1 −1		src/network.h
+5 −5		src/pthreads.cpp
+1 −1		src/semaphore.cpp
+1 −1		src/sysconf.cpp
+7 −0		src/system_properties.cpp
+1 −0		src/system_properties.h
+2 −2		src/imgui_ui.cpp
+2 −2		src/jni/sdl3audio.cpp
+1 −1		src/main.cpp
+35 −5		src/window_callbacks.cpp
+1 −0		src/window_callbacks.h