builds godot
21 files changed, 355 insertions, 249 deletions
diff --git a/.github/2d-build-modules.py b/.github/2d-build-modules.py index 2502a1c..0c3fb29 100644 --- a/.github/2d-build-modules.py +++ b/.github/2d-build-modules.py @@ -1,22 +1,69 @@ module_bmp_enabled = "no" -module_bullet_enabled = "no" module_csg_enabled = "no" module_enet_enabled = "no" module_etc_enabled = "no" -module_fbx_enabled = "no" -module_etc_enabled = "no" -module_gdnative_enabled = "no" module_gltf_enabled = "no" module_gridmap_enabled = "no" module_hdr_enabled = "no" module_jpg_enabled = "no" -module_jsonrpc_enabled = "no" module_lightmapper_cpu_enabled = "no" +module_webm_enabled = "no" +debug_symbols = "no" +optimize = "size" +lto = "auto" +production = "yes" +deprecated = "no" +minizip = "yes" +vulkan = "yes" +opengl3 = "yes" +openxr = "no" +pulseaudio = "yes" +dbus = "yes" +speechd = "no" +fontconfig = "yes" +udev = "yes" +x11 = "yes" +touch = "yes" +execinfo = "no" +module_basis_universal_enabled = "yes" +module_camera_enabled = "yes" +module_cvtt_enabled = "no" +module_dds_enabled = "no" +module_denoise_enabled = "no" +module_etcpak_enabled = "no" +brotli = "yes" +module_freetype_enabled = "yes" +module_gdscript_enabled = "yes" +module_glslang_enabled = "yes" +module_jsonrpc_enabled = "no" +module_lightmapper_rd_enabled = "no" +module_mbedtls_enabled = "no" +module_meshoptimizer_enabled = "no" +module_minimp3_enabled = "no" module_mobile_vr_enabled = "no" +module_mono_enabled = "no" +module_msdfgen_enabled = "no" +module_multiplayer_enabled = "no" +module_navigation_enabled = "yes" +module_noise_enabled = "no" +module_ogg_enabled = "yes" +module_openxr_enabled = "no" +module_raycast_enabled = "yes" +module_regex_enabled = "yes" +module_squish_enabled = "no" +module_svg_enabled = "yes" +graphite = "yes" +module_text_server_adv_enabled = "yes" +module_text_server_fb_enabled = "yes" +module_tga_enabled = "no" module_theora_enabled = "no" -module_upnp_enabled = "no" +module_tinyexr_enabled = "no" +module_upnp_enabled = "no" # universal plug and play module_vhacd_enabled = "no" -module_visual_script_enabled = "no" -module_webm_enabled = "no" +module_vorbis_enabled = "yes" +module_webp_enabled = "yes" +module_webrtc_enabled = "no" +module_websocket_enabled = "no" module_webxr_enabled = "no" module_xatlas_unwrap_enabled = "no" +module_zip_enabled = "no" diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..1bfbcab --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +ko_fi: bendn diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml index 8c84607..e30436e 100644 --- a/.github/actions/build-godot/action.yml +++ b/.github/actions/build-godot/action.yml @@ -2,10 +2,6 @@ name: Build godot description: Builds godot with a certain version and certain flags inputs: - url: - description: Godot git url - default: https://github.com/godotengine/godot - required: true platform: description: Platform to build for required: true @@ -13,21 +9,21 @@ inputs: description: Flags to pass to the build script required: false target: - description: Target (release, release_debug, debug) + description: Target (template_release, template_debug, editor) required: true runs: using: "composite" steps: - name: Setup - uses: bend-n/godot-builds/.github/actions/setup@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: ref: ${{ env.ref }} - name: Install linux dependencies - if: ${{ inputs.platform }} == "x11" + if: inputs.platform == 'linuxbsd' run: | - [[ ${{ inputs.platform }} != "x11" ]] && exit 0 + echo ::group::Dependencies sudo apt-get update -q sudo apt-get install -qqq \ build-essential pkg-config libx11-dev libxcursor-dev \ @@ -35,19 +31,30 @@ runs: libpulse-dev libudev-dev libxi-dev libxrandr-dev yasm \ libspeechd-dev speech-dispatcher \ tree + echo ::endgroup:: shell: bash - name: Setup scons - run: pip install scons + run: pip install --force-reinstall -v "scons==4.4.0" shell: bash + - name: Download more ram + if: runner.os == 'Linux' + uses: pierotofy/set-swap-space@master + with: + swap-size-gb: 10 + - name: Build Godot run: | + echo ::group::Compilation cd godot - scons_flags=$flags + scons_flags=${{ env.flags }} cores=$(nproc) || cores=$(sysctl -n hw.ncpu) [[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}" - scons -j$((cores+2)) p=${{ inputs.platform }} tools=$tools target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags + [[ ${{ env.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor + echo "Running `scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes tools=${{ env.tools }} $scons_flags`" + scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes "tools=${{ env.tools }}" $scons_flags strip bin/* || true ls bin + echo ::endgroup:: shell: bash diff --git a/.github/actions/build-upload-image/action.yml b/.github/actions/build-upload-image/action.yml index 6449aa5..172a05e 100644 --- a/.github/actions/build-upload-image/action.yml +++ b/.github/actions/build-upload-image/action.yml @@ -16,23 +16,23 @@ runs: - uses: actions/checkout@v3 - name: Get version - uses: bend-n/godot-builds/.github/actions/get-version@main + uses: bend-n/godot-builds/.github/actions/[email protected] - name: Get templates uses: actions/download-artifact@v3 with: name: templates - - name: Get headless + - name: Get headless editor uses: actions/download-artifact@v3 with: - name: server-tools-release + name: server-editor-release - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot shell: bash - name: Login to GitHub Container Registry - uses: docker/[email protected] + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} @@ -44,9 +44,7 @@ runs: context: . file: Dockerfile push: true - tags: ghcr.io/${{ github.repository_owner }}/${{ inputs.name }}:${{ env.version-name }}${{ env.tag }} + tags: ghcr.io/${{ github.repository_owner }}/${{ inputs.name }}:${{ env.release-name }} build-args: | GODOT_VERSION=${{ env.version-name }} RELEASE_NAME=${{ env.release }} - env: - tag: ${{ env.release-name }} diff --git a/.github/actions/get-version/action.yml b/.github/actions/get-version/action.yml index 29cd150..fe72950 100644 --- a/.github/actions/get-version/action.yml +++ b/.github/actions/get-version/action.yml @@ -5,14 +5,19 @@ runs: using: "composite" steps: - name: Setup - uses: bend-n/godot-builds/.github/actions/setup@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: ref: ${{ env.ref }} - name: Get version run: | cd godot - echo 'print(f"{major}.{minor}")' >> version.py + # i could not get heredocs to work here + echo 'if patch:' >> version.py + echo ' print(f"{major}.{minor}.{patch}")' >> version.py + echo 'else:' >> version.py + echo ' print(f"{major}.{minor}")' >> version.py + echo "version-name=$(python version.py)" >> $GITHUB_ENV version=$(python version.py) @@ -23,8 +28,12 @@ runs: release=$(python version.py) release_name="$version" - [[ ${release} == 'stable' ]] || release_name+=${release} + [[ $release == 'stable' ]] || release_name+=".${release}" echo "release-name=$release_name" >> $GITHUB_ENV + + prerelease="true" + [[ $release == 'stable' ]] && prerelease="false" + echo "prerelease=${prerelease}" >> $GITHUB_ENV shell: bash - name: Post get version diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index 5c39478..1c42329 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -13,32 +13,32 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v3 - - name: Get version - uses: bend-n/godot-builds/.github/actions/get-version@main + uses: bend-n/godot-builds/.github/actions/[email protected] - name: Get templates uses: actions/download-artifact@v3 with: name: templates - - name: Get headless + - name: Get editor uses: actions/download-artifact@v3 with: - name: server-tools-release + name: linuxbsd-editor-release - - name: Get editor + - name: Get headless uses: actions/download-artifact@v3 with: - name: x11-tools-release + name: server-editor-release - name: Compress run: | - mv godot.x11.opt.tools.64 Godot_v3.5-stable_x11.64 && xz -ze9T0 Godot_v3.5-stable_x11.64 & - mv godot_server.x11.opt.tools.64 "${{ inputs.name }}_v3.5-stable_linux_headless.64" && xz -ze9T0 "${{ inputs.name }}_v3.5-stable_linux_headless.64" & - mv templates.tpz Godot_v3.5-stable_export_templates.tpz + mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64 + mv godot_server.x11.opt.tools.64 ${{ env.fstart }}_linux_headless.64 + mv templates.tpz ${{ env.fstart }}_export_templates.tpz shell: bash + env: + fstart: ${{ inputs.name }}_v${{ env.version-name }} - name: Release uses: softprops/action-gh-release@v1 @@ -46,6 +46,11 @@ runs: body: "### ${{ env.release-name}} :rocket:" tag_name: ${{ env.release-name }} files: | - Godot_v3.5-stable_export_templates.tpz - Godot_v3.5-stable_x11.64 + ${{ env.fstart }}_export_templates.tpz + ${{ env.fstart }}_linux.x86_64 + ${{ env.fstart }}_linux_headless.64 token: ${{ inputs.github-token }} + prerelease: ${{ env.prerelease }} + fail_on_unmatched_files: true + env: + fstart: ${{ inputs.name }}_v${{ env.version-name }} diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index d26934c..ca3d7e2 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -2,10 +2,6 @@ name: "Setup" description: "Setup the environment for building" inputs: - repo: - description: Godot github owner/repo - default: godotengine/godot - required: true ref: description: Which ref to build required: true @@ -16,14 +12,14 @@ runs: - name: Check if clean id: clean run: | - if [[ -d godot ]]; then echo "::set-output name=clean::false"; - else echo "::set-output name=clean::true"; fi + if [[ -d godot ]]; then echo "clean=false" >> $GITHUB_OUTPUT; + else echo "clean=true" >> $GITHUB_OUTPUT; fi shell: bash - uses: actions/checkout@v3 if: steps.clean.outputs.clean == 'true' with: - repository: ${{ inputs.repo }} + repository: godotengine/godot ref: ${{ inputs.ref }} path: "godot" @@ -34,7 +30,7 @@ runs: - name: Setup Python if: steps.clean.outputs.clean == 'true' - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.9 @@ -42,9 +38,11 @@ runs: if: steps.clean.outputs.clean == 'true' run: | # Patch godot - echo "::group::Patch godot" (cd repo && mv "${{ env.modules }}" ../godot/custom.py && mv patches ../godot) cd godot - for patch in patches/*; do git apply --ignore-whitespace "$patch" || echo "::error file={${patch}}::Go update your patch"; done - echo "::endgroup::" + for patch in patches/*; do git apply --ignore-whitespace "$patch" || err="$patch"; done + if [[ -n $err ]]; then + echo "::error file={${err}}::Go update your patch" + exit 1 + fi shell: bash diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index 3bb9387..84bc56f 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -16,7 +16,7 @@ runs: using: "composite" steps: - name: Upload Godot Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ inputs.name }} path: ${{ inputs.path }} diff --git a/.github/editor-settings.tres b/.github/editor-settings-3.tres index ed95707..bb64ddc 100644 --- a/.github/editor-settings.tres +++ b/.github/editor-settings-3.tres @@ -42,9 +42,9 @@ export/web/http_port = 8060 export/web/use_ssl = false export/web/ssl_key = "" export/web/ssl_certificate = "" -export/windows/rcedit = "" +export/windows/rcedit = "/usr/share/rcedit.exe" export/windows/osslsigncode = "" -export/windows/wine = "" +export/windows/wine = "/usr/bin/wine" interface/scene_tabs/always_show_close_button = false interface/editor/save_on_focus_loss = false interface/editor/show_update_spinner = false @@ -133,4 +133,4 @@ editors/3d_gizmos/gizmo_colors/joint_body_a = Color( 0.6, 0.8, 1, 1 ) editors/3d_gizmos/gizmo_colors/joint_body_b = Color( 0.6, 0.9, 1, 1 ) text_editor/help/sort_functions_alphabetically = true text_editor/highlighting/gdscript/function_definition_color = Color( 0.4, 0.9, 1, 1 ) -text_editor/highlighting/gdscript/node_path_color = Color( 0.39, 0.76, 0.35, 1 )
\ No newline at end of file +text_editor/highlighting/gdscript/node_path_color = Color( 0.39, 0.76, 0.35, 1 )
\ No newline at end of file diff --git a/.github/editor-settings-4.tres b/.github/editor-settings-4.tres new file mode 100644 index 0000000..69c123a --- /dev/null +++ b/.github/editor-settings-4.tres @@ -0,0 +1,103 @@ +[gd_resource type="EditorSettings" format=3] + +[resource] +interface/editor/main_font_size = 15 +interface/editor/code_font_size = 17.0 +interface/editor/code_font_contextual_ligatures = 0 +interface/editor/low_processor_mode_sleep_usec = 13800.0 +interface/editor/single_window_mode = true +interface/inspector/show_low_level_opentype_features = true +interface/scene_tabs/show_thumbnail_on_hover = false +editors/3d/default_z_near = 0.01 +network/http_proxy/port = -1 +asset_library/available_urls = { +"godotengine.org (Official)": "https://godotengine.org/asset-library/api" +} +asset_library/use_threads = true +export/android/android_sdk_path = "" +export/android/debug_keystore = "" +export/android/debug_keystore_user = "androiddebugkey" +export/android/debug_keystore_pass = "android" +export/android/force_system_user = false +export/android/shutdown_adb_on_exit = true +export/android/one_click_deploy_clear_previous_install = false +export/web/http_host = "localhost" +export/web/http_port = 8060 +export/web/use_ssl = false +export/web/ssl_key = "" +export/web/ssl_certificate = "" +export/macos/force_builtin_codesign = false +export/windows/rcedit = "/usr/share/rcedit.exe" +export/windows/osslsigncode = "" +export/windows/wine = "/bin/wine" +interface/editor/save_on_focus_loss = false +interface/editor/show_update_spinner = true +interface/editor/update_continuously = false +interface/editor/localize_settings = true +interface/scene_tabs/restore_scenes_on_load = true +interface/inspector/default_property_name_style = 1 +interface/inspector/default_float_step = 0.1 +interface/inspector/disable_folding = false +interface/inspector/auto_unfold_foreign_scenes = true +interface/inspector/horizontal_vector2_editing = false +interface/inspector/horizontal_vector_types_editing = true +interface/inspector/open_resources_in_current_inspector = true +interface/inspector/resources_to_open_in_new_inspector = "Script,MeshLibrary" +interface/inspector/default_color_picker_mode = 0 +interface/inspector/default_color_picker_shape = 3 +_default_feature_profile = "" +interface/editors/show_scene_tree_root_selection = true +interface/editors/derive_script_globals_by_name = true +_use_favorites_root_selection = false +interface/editors/default_signal_callback_name = "_on_{node_name}_{signal_name}" +filesystem/file_server/port = 6010 +filesystem/file_server/password = "" +debugger/auto_switch_to_remote_scene_tree = false +debugger/profiler_frame_max_functions = 64 +debugger/remote_scene_tree_refresh_interval = 1.0 +debugger/remote_inspect_refresh_interval = 0.2 +network/debug_adapter/remote_port = 6006 +network/debug_adapter/request_timeout = 1000 +network/debug_adapter/sync_breakpoints = false +editors/3d/manipulator_gizmo_size = 80 +editors/3d/manipulator_gizmo_opacity = 0.9 +editors/3d/navigation/show_viewport_rotation_gizmo = true +text_editor/behavior/files/auto_reload_and_parse_scripts_on_save = true +text_editor/behavior/files/open_dominant_script_on_scene_change = false +text_editor/external/use_external_editor = false +text_editor/external/exec_path = "/bin/code" +text_editor/script_list/script_temperature_enabled = true +text_editor/script_list/script_temperature_history_size = 15 +text_editor/script_list/group_help_pages = true +text_editor/script_list/sort_scripts_by = 0 +text_editor/script_list/list_script_names_as = 0 +text_editor/external/exec_flags = "{project} --goto {file}:{line}:{col}" +editors/3d_gizmos/gizmo_colors/path = Color(0.5, 0.5, 1, 0.8) +editors/3d_gizmos/gizmo_colors/skeleton = Color(1, 0.8, 0.4, 1) +editors/3d_gizmos/gizmo_colors/selected_bone = Color(0.8, 0.3, 0, 1) +editors/3d_gizmos/gizmo_settings/bone_axis_length = 0.1 +editors/3d_gizmos/gizmo_settings/bone_shape = 1 +editors/3d_gizmos/gizmo_colors/csg = Color(0, 0.4, 1, 0.15) +editors/grid_map/editor_side = 1 +editors/grid_map/palette_min_width = 230 +editors/grid_map/preview_size = 64 +network/language_server/remote_host = "127.0.0.1" +network/language_server/remote_port = 6005 +network/language_server/enable_smart_resolve = true +network/language_server/show_native_symbols_in_editor = false +network/language_server/use_thread = false +filesystem/import/blender/blender3_path = "/bin" +filesystem/import/fbx/fbx2gltf_path = "" +export/macos/rcodesign = "" +export/web/use_tls = false +export/web/tls_key = "" +export/web/tls_certificate = "" +version_control/username = "" +version_control/ssh_public_key_path = "" +version_control/ssh_private_key_path = "" +interface/editors/default_signal_callback_to_self_name = "_on_{signal_name}" +editors/3d/navigation/show_viewport_navigation_gizmo = false +export/ssh/ssh = "" +export/ssh/scp = "" +filesystem/import/blender/rpc_port = 0 +filesystem/import/blender/rpc_server_uptime = 5
\ No newline at end of file diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py index e69de29..189b130 100644 --- a/.github/normal-build-modules.py +++ b/.github/normal-build-modules.py @@ -0,0 +1,5 @@ +debug_symbols = "no" +optimize = "size" +lto = "auto" +production = "yes" +deprecated = "no" diff --git a/.github/workflows/build-3.5-2d.yml b/.github/workflows/build-3.5-2d.yml deleted file mode 100644 index d06a76c..0000000 --- a/.github/workflows/build-3.5-2d.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Build godot 3.5 stable (2d) - -on: - workflow_dispatch: - push: - branches: - - main - paths: - - .github/2d*.py - - "**.yml" - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.5-stable - secrets: inherit diff --git a/.github/workflows/build-3.5-normal.yml b/.github/workflows/build-3.5-normal.yml deleted file mode 100644 index 96d0f93..0000000 --- a/.github/workflows/build-3.5-normal.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Build godot 3.5 stable (normal) - -on: - workflow_dispatch: - push: - branches: - - main - paths: - - .github/normal*.py - - "**.yml" - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.5-stable - name: godot - build-name: normal - modules-path: ./.github/normal-build-modules.py - secrets: inherit diff --git a/.github/workflows/build-3.x-2d.yml b/.github/workflows/build-3.x-2d.yml deleted file mode 100644 index cf9f012..0000000 --- a/.github/workflows/build-3.x-2d.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Build godot on branch 3.x (2d) - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - push: - branches: - - main - paths: - - .github/2d*.py - - "**.yml" - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.x - secrets: inherit diff --git a/.github/workflows/build-3.x-normal.yml b/.github/workflows/build-3.x-normal.yml deleted file mode 100644 index 5a722e9..0000000 --- a/.github/workflows/build-3.x-normal.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Build godot on branch 3.x (normal) - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * *" - push: - branches: - - main - paths: - - .github/normal*.py - - "**.yml" - -jobs: - build: - name: Build - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main - with: - ref: 3.x - name: godot - build-name: normal - modules-path: ./.github/normal-build-modules.py - secrets: inherit diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build-2d.yml index 99751e1..77bbc9a 100644 --- a/.github/workflows/manual-build.yml +++ b/.github/workflows/manual-build-2d.yml @@ -1,4 +1,4 @@ -name: Manually build godot 2d +name: Manually build godot 2D on: workflow_dispatch: @@ -9,9 +9,13 @@ on: required: true jobs: - manual-build: + two-dimensions: name: Build ${{ inputs.ref }} - uses: bend-n/godot-builds/.github/workflows/reusable-build.yml@main + uses: bend-n/godot-builds/.github/workflows/[email protected] with: ref: ${{ inputs.ref }} + name: godot-2d + build-name: bendn.2D + modules-path: ./.github/2d-build-modules.py + flags: "" secrets: inherit diff --git a/.github/workflows/manual-build-normal.yml b/.github/workflows/manual-build-normal.yml new file mode 100644 index 0000000..f58e373 --- /dev/null +++ b/.github/workflows/manual-build-normal.yml @@ -0,0 +1,24 @@ +name: Manually build godot normal + +on: + workflow_dispatch: + inputs: + ref: + type: string + description: which ref to build + required: true + # turn on when the godot5 is in dev + # schedule: + # - cron: '30 20 * * *' + +jobs: + all-dimensions: + name: Build ${{ inputs.ref }} + uses: bend-n/godot-builds/.github/workflows/[email protected] + with: + ref: ${{ inputs.ref }} + name: godot + build-name: bendn + modules-path: ./.github/normal-build-modules.py + flags: "" + secrets: inherit diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 2c0a0db..0b6f9f7 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -4,24 +4,25 @@ on: workflow_call: inputs: ref: - required: true type: string + required: true flags: type: string - default: disable_3d=yes + default: "" required: false modules-path: type: string - default: ./.github/2d-build-modules.py - required: false + required: true name: type: string - default: godot-2d - required: false + required: true build-name: type: string - default: 2d - required: false + required: true + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.ref }} + cancel-in-progress: true env: BUILD_NAME: ${{ inputs.build-name }} @@ -40,14 +41,14 @@ jobs: bits: [64] steps: - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: bits=${{ matrix.bits }} ${{ env.flags }} - platform: x11 + platform: linuxbsd - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.64 @@ -60,14 +61,14 @@ jobs: runs-on: windows-latest steps: - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: bits=${{ matrix.bits }} ${{ env.flags }} platform: windows - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.exe @@ -79,19 +80,20 @@ jobs: target: [release, release_debug] steps: - name: Set up Java 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: java-version: 11 + distribution: temurin - name: Compilation (armv7) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: android_arch=armv7 ${{ env.flags }} platform: android - name: Compilation (arm64v8) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: android_arch=arm64v8 ${{ env.flags }} @@ -103,7 +105,7 @@ jobs: (cd platform/android/java && ./gradlew generateGodotTemplates) - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.apk @@ -112,18 +114,37 @@ jobs: matrix: target: [release, release_debug] - name: MacOS temps + name: macOS temps runs-on: macos-latest steps: + - name: Install MoltenVK + run: | # curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh + curl -L "https://sdk.lunarg.com/sdk/download/latest/mac/vulkan-sdk.dmg" -o /tmp/vulkan-sdk.dmg + hdiutil attach /tmp/vulkan-sdk.dmg -mountpoint /Volumes/vulkan-sdk + /Volumes/vulkan-sdk/InstallVulkan.app/Contents/MacOS/InstallVulkan \ + --accept-licenses --default-answer --confirm-command install + + cnt=5 + until hdiutil detach -force /Volumes/vulkan-sdk + do + [[ cnt -eq "0" ]] && break + sleep 1 + ((cnt--)) + done + + rm -f /tmp/vulkan-sdk.dmg + + echo 'Vulkan SDK installed successfully! You can now build Godot by running "scons".' + - name: Compilation(x86_64) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: flags: arch=x86_64 ${{ env.flags }} target: ${{ matrix.target }} platform: macos - name: Compilation(arm64) - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: flags: arch=arm64 ${{ env.flags }} target: ${{ matrix.target }} @@ -139,7 +160,7 @@ jobs: strip "bin/godot.osx.opt$target.universal" - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.universal @@ -152,24 +173,23 @@ jobs: name: JS temps runs-on: ubuntu-20.04 steps: - - name: Set up Emscripten 3.1.10 - uses: mymindstorm/setup-emsdk@v10 + - name: Set up Emscripten 3.1.18 + uses: mymindstorm/setup-emsdk@v12 with: - version: 3.1.10 + version: 3.1.18 - name: Verify Emscripten setup - run: | - emcc -v + run: emcc -v - name: Compilation - uses: bend-n/godot-builds/.github/actions/build-godot@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: target: ${{ matrix.target }} flags: ${{ env.flags }} ${{ matrix.flags }} platform: javascript - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: godot/bin/*.zip @@ -183,22 +203,28 @@ jobs: - name: Download all artifacts uses: actions/download-artifact@v3 + - name: List all downloaded files + run: ls -R + + - name: Getdot + uses: actions/checkout@v3 + with: + repository: godotengine/godot + ref: ${{ inputs.ref }} + path: godot-repo + - name: Prepare files run: | mkdir -vp ${tmps} - git clone --depth 1 'https://github.com/godotengine/godot' -b 3.x godot-repo echo "Preparing linux" mv linux/godot.x11.opt.64 ${tmps}/linux_x11_64_release mv linux/godot.x11.opt.debug.64 ${tmps}/linux_x11_64_debug - echo "Preparing windows" mv windows/godot.windows.opt.64.exe ${tmps}/windows_64_release.exe mv windows/godot.windows.opt.debug.64.exe ${tmps}/windows_64_debug.exe - echo "Preparing android" mv android/android_debug.apk ${tmps}/android_debug.apk mv android/android_release.apk ${tmps}/android_release.apk - echo "Preparing macos" cp -r godot-repo/misc/dist/osx_template.app . mkdir -p osx_template.app/Contents/MacOS @@ -206,7 +232,6 @@ jobs: cp macos/godot.osx.opt.debug.universal osx_template.app/Contents/MacOS/godot_osx_debug.64 chmod +x osx_template.app/Contents/MacOS/godot_osx_*.64 zip -q -9 -r ${tmps}/osx.zip osx_template.app - echo "Preparing web" mv javascript/godot.javascript.opt.zip ${tmps}/webassembly_release.zip mv javascript/godot.javascript.opt.debug.zip ${tmps}/webassembly_debug.zip @@ -216,23 +241,23 @@ jobs: mv javascript/godot.javascript.opt.debug.gdnative.zip ${tmps}/webassembly_gdnative_debug.zip - name: Prepare bundle - run: "cd ${tmps} && zip -q -9 -r templates.tpz ./*" + run: cd "${tmps}" && zip -qr9 templates.tpz ./* - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: path: ${{ env.tmps }}/templates.tpz - tools: + editor: strategy: matrix: - platform: [server, x11] + platform: [server, linuxbsd] - name: Build linux tools - runs-on: ubuntu-18.04 + name: Linux editor + runs-on: ubuntu-20.04 steps: - - name: Build editor - uses: bend-n/godot-builds/.github/actions/build-godot@main + - name: Compilation + uses: bend-n/godot-builds/.github/actions/[email protected] with: platform: ${{ matrix.platform }} target: release_debug @@ -241,17 +266,18 @@ jobs: flags: "" # override flags - name: Upload artifact - uses: bend-n/godot-builds/.github/actions/upload-artifact@main + uses: bend-n/godot-builds/.github/actions/[email protected] with: - name: ${{ matrix.platform }}-tools-release + name: ${{ matrix.platform }}-editor-release path: godot/bin/*.64 - build-image: - name: Build docker image + image: + permissions: write-all + name: Docker image runs-on: ubuntu-latest - needs: [tools, templates] + needs: [editor, templates] steps: - - uses: bend-n/godot-builds/.github/actions/build-upload-image@main + - uses: bend-n/godot-builds/.github/actions/[email protected] with: github-token: ${{ secrets.GITHUB_TOKEN }} name: ${{ inputs.name }} @@ -259,9 +285,9 @@ jobs: release: name: Create/update a release runs-on: ubuntu-latest - needs: [tools, templates] + needs: [editor, templates] steps: - - uses: bend-n/godot-builds/.github/actions/release@main + - uses: bend-n/godot-builds/.github/actions/[email protected] with: github-token: ${{ secrets.GITHUB_TOKEN }} name: ${{ inputs.name }} @@ -1,37 +1,26 @@ -FROM ubuntu:focal -LABEL author="bendn" +FROM ubuntu:jammy +LABEL author "bendn" +LABEL org.opencontainers.image.description "godot builds containerized for quick use, contains rcedit, blender and wine" USER root ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - git \ - git-lfs \ - python \ - python-openssl \ - unzip \ - wget \ - zip \ - adb \ + git git-lfs unzip sudo adb \ openjdk-11-jdk-headless \ - rsync \ + wget zip rsync wine64 blender \ && rm -rf /var/lib/apt/lists/* ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 -ARG GODOT_VERSION="3.5" -ARG RELEASE_NAME="rc" +ARG GODOT_VERSION +ARG RELEASE_NAME -COPY ./templates.tpz /root/templates.tpz +COPY ./templates.tpz /root/templates.tpz COPY ./godot /usr/local/bin/godot -RUN mkdir ~/.cache \ - && mkdir -p /root/.config/godot \ - && mkdir -p /root/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE_NAME} \ - && unzip -q /root/templates.tpz -d /root/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE_NAME} \ - && rm /root/templates.tpz -# Install editor-settings.tres -ADD https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/editor-settings.tres /root/.config/godot/editor_settings-3.tres +# Install editor settings +ADD https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/editor-settings-4.tres /root/.config/godot/editor_settings-4.tres +ADD https://raw.githubusercontent.com/bend-n/godot-builds/main/.github/editor-settings-3.tres /root/.config/godot/editor_settings-3.tres -# Test if godot is working -RUN godot -e -q +# Install rcedit +ADD https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe /usr/share/rcedit.exe diff --git a/PKGBUILD b/PKGBUILD deleted file mode 100644 index dd38f8b..0000000 --- a/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: bendn <[email protected]> -# shellcheck disable=SC2148,SC2034 - -pkgname="godot2d" -pkgver='3.5.stable' -pkgrel=1 -pkgdesc="godot builds without all the 3d stuff." -arch=('any') -url="https://github.com/bend-n/godot-builds" -license=('MIT') -depends=(libxcursor libxinerama libxi libxrandr libglvnd) -makedepends=('github-cli' 'git') -md5sums=() -source=() -provides=('godot2d') - -_repo="github.com/bend-n/godot-builds" - -_get() { - gh run download "$1" -n "$2" -R "$_repo" -} - -package() { - id=$(gh workflow view build-3.5-2d.yml | sed '6q;d' | awk -F'\t' '{print $8}') - _get "$id" "x11-tools-release" & - _get "$id" "templates" - install -Dm755 godot.x11.opt.tools.64 "$pkgdir/usr/bin/godot2d" - install -Dm755 "$pkgdir/usr/share/godot/templates/${pkgver}.stable" - unzip -of templates.tpz -d "$pkgdir/usr/share/godot/templates/${pkgver}.stable" -} @@ -1,5 +1,9 @@ # godot builds +[](https://godotengine.org) +[](https://aur.archlinux.org/packages/godot2d "Aur package") +<a href='https://ko-fi.com/bendn' title='Buy me a coffee' target='_blank'><img height='28' src='https://ko-fi.com/img/githubbutton_sm.svg' alt='Buy me a coffee'> </a> + Creates two packages. - `godot`: Docker images with the _normal_ godot build. @@ -8,7 +12,7 @@ Creates two packages. ## How to use -For a full example, see this [template](https://github.com/bend-n/godot-template/blob/3d79cf6cc3e25317763ad4100e2a8692b0c2644e/.github/workflows/export.yml). +For a full example, see this [template](https://github.com/bend-n/godot-template/blob/9c9e2b02ddf9f88bff872dcd2695363d09485bc4/.github/workflows/export.yml). <details open> <summary>With helpers (recomended)</summary> @@ -23,7 +27,6 @@ build-windows: - name: Build (Windows) uses: bend-n/godot-actions/.github/actions/export-windows@main env: - GODOT_VERSION: 3.5 NAME: ${{ github.event.repository.name }} ``` @@ -33,7 +36,6 @@ build-windows: <summary>Manually</summary> > **Warning** -> > This method has _not_ been tested. ```yaml @@ -48,7 +50,7 @@ build-windows: - name: Setup godot run: | - RELEASE=stable; GODOT_VERSION=3.5; + RELEASE=stable; GODOT_VERSION=3.5.stable; mkdir -v -p ~/.local/share/godot/templates mv /root/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE} ~/.local/share/godot/templates/${GODOT_VERSION}.${RELEASE} @@ -60,7 +62,7 @@ build-windows: GAME_NAME: ${{ github.event.repository.name }} - name: Upload - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: windows path: build/windows |