builds godot
| -rw-r--r-- | .github/2d-build-modules.py | 8 | ||||
| -rw-r--r-- | .github/actions/build-godot/action.yml | 15 | ||||
| -rw-r--r-- | .github/actions/build-upload-image/action.yml | 14 | ||||
| -rw-r--r-- | .github/actions/release/action.yml | 11 | ||||
| -rw-r--r-- | .github/actions/upload-artifact/action.yml | 4 | ||||
| -rw-r--r-- | .github/normal-build-modules.py | 5 | ||||
| -rw-r--r-- | .github/workflows/reusable-build.yml | 109 |
7 files changed, 82 insertions, 84 deletions
diff --git a/.github/2d-build-modules.py b/.github/2d-build-modules.py index b0481e6..698b100 100644 --- a/.github/2d-build-modules.py +++ b/.github/2d-build-modules.py @@ -1,11 +1,9 @@ +debug_symbols = "no" brotli = "yes" # compression and woff2 dbus = "no" # screensaver and portal -debug_symbols = "no" -deprecated = "no" execinfo = "no" fontconfig = "yes" # system fonts graphite = "yes" -lto = "auto" minizip = "no" # zip support module_astcenc_enabled = "no" # adaptive scalable data compression format module_basis_universal_enabled = "yes" @@ -48,18 +46,18 @@ module_text_server_adv_enabled = "yes" # the cooler text server module_tga_enabled = "no" # more image formats module_theora_enabled = "no" # ogg theora video format module_tinyexr_enabled = "no" # image +module_ktx_enabled = "no" # why are there so many random image formats module_upnp_enabled = "no" # universal plug and play module_vhacd_enabled = "no" # 3d surface stuff module_vorbis_enabled = "yes" # vorbis audio module_webp_enabled = "yes" # lossy compression format module_webrtc_enabled = "no" -module_websocket_enabled = "no" +module_websocket_enabled = "yes" # websockets are useful, and editor needs for LSP module_webxr_enabled = "no" module_xatlas_unwrap_enabled = "no" # lightmapping stuff module_zip_enabled = "no" opengl3 = "yes" optimize = "size" -production = "yes" pulseaudio = "yes" # linux audio speechd = "no" # tts touch = "yes" # touchscreen diff --git a/.github/actions/build-godot/action.yml b/.github/actions/build-godot/action.yml index dc6e09d..88ec767 100644 --- a/.github/actions/build-godot/action.yml +++ b/.github/actions/build-godot/action.yml @@ -11,6 +11,9 @@ inputs: target: description: Target (template_release, template_debug, editor) required: true + tools: + description: Tools! + default: "no" runs: using: "composite" @@ -48,12 +51,14 @@ runs: run: | echo ::group::Compilation cd godot - scons_flags=${{ env.flags }} + scons_flags="${{ env.flags }} ${{ inputs.flags }} tools=${{ inputs.tools }}" cores=$(nproc) || cores=$(sysctl -n hw.ncpu) - [[ -n "${{ inputs.flags }}" ]] && scons_flags="${{ inputs.flags }}" - [[ ${{ inputs.target }} == "editor" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor - scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} use_lto=yes udev=yes $scons_flags - strip bin/* || true + [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="${scons_flags//disable_3d=yes/}" # remove disable_3d=yes if editor + [[ ${{ inputs.tools }} == "yes" ]] && scons_flags="$scons_flags debug_symbols=no" + [[ ${{ inputs.target }} ]] && scons_flags="$scons_flags deprecated=no" + scons -j$((cores+2)) p=${{ inputs.platform }} target=${{ inputs.target }} verbose=yes udev=yes dev_build=no lto=auto $scons_flags + echo "compile done" + [[ ${{ inputs.target}} != "editor" ]] && strip -v 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 4fbf2c5..aff9222 100644 --- a/.github/actions/build-upload-image/action.yml +++ b/.github/actions/build-upload-image/action.yml @@ -19,16 +19,20 @@ runs: uses: bend-n/godot-builds/.github/actions/get-version@main - name: Get templates - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: templates - - name: Get editor - uses: actions/download-artifact@v3 + - name: Get headless editor + uses: actions/download-artifact@v4 with: - name: linuxbsd-editor-release + name: server-editor-release - - run: mv godot.linuxbsd.editor.x86_64 godot && chmod -v +x godot + - name: List all downloaded files + run: ls -R + shell: bash + + - run: mv godot_server.x11.opt.tools.64 godot && chmod -v +x godot shell: bash - name: Login to GitHub Container Registry diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml index ad49765..c5e8fca 100644 --- a/.github/actions/release/action.yml +++ b/.github/actions/release/action.yml @@ -17,18 +17,23 @@ runs: uses: bend-n/godot-builds/.github/actions/get-version@main - name: Get templates - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: templates - name: Get editor - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: linuxbsd-editor-release + - name: List all downloaded files + run: ls -R + shell: bash + - name: Compress run: | - mv godot.linuxbsd.editor.x86_64 ${{ env.fstart }}_linux.x86_64 + strip godot.x11.opt.tools.64 -v || true + mv godot.x11.opt.tools.64 ${{ env.fstart }}_linux.x86_64 mv templates.tpz ${{ env.fstart }}_export_templates.tpz shell: bash env: diff --git a/.github/actions/upload-artifact/action.yml b/.github/actions/upload-artifact/action.yml index 84bc56f..40b442b 100644 --- a/.github/actions/upload-artifact/action.yml +++ b/.github/actions/upload-artifact/action.yml @@ -5,7 +5,7 @@ description: Uploads the artifact inputs: name: description: The artifact name. - default: "${{ github.job }}" + default: "${{ github.job }}-${{ matrix.target }}" required: true path: description: The path to upload. @@ -16,7 +16,7 @@ runs: using: "composite" steps: - name: Upload Godot Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ inputs.name }} path: ${{ inputs.path }} diff --git a/.github/normal-build-modules.py b/.github/normal-build-modules.py index 189b130..75f14db 100644 --- a/.github/normal-build-modules.py +++ b/.github/normal-build-modules.py @@ -1,5 +1,2 @@ +optimize = "speed" debug_symbols = "no" -optimize = "size" -lto = "auto" -production = "yes" -deprecated = "no" diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index fabd372..b8b09f2 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -40,7 +40,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] bits: [64] steps: - name: Compilation @@ -53,12 +53,12 @@ jobs: - name: Upload artifact uses: bend-n/godot-builds/.github/actions/upload-artifact@main with: - path: godot/bin/*.x86_64 + path: godot/bin/*.64 windows: strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] bits: [64] name: Win temps runs-on: windows-latest @@ -80,12 +80,12 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] steps: - - name: Set up Java 11 + - name: Set up Java 17 uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 distribution: temurin - name: Compilation (armv7) @@ -115,30 +115,14 @@ jobs: macos: strategy: matrix: - target: [template_release, template_debug] + target: [release, release_debug] 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".' - + run: curl https://raw.githubusercontent.com/godotengine/godot/master/misc/scripts/install_vulkan_sdk_macos.sh -s | sh + - name: Compilation(x86_64) uses: bend-n/godot-builds/.github/actions/build-godot@main with: @@ -155,12 +139,12 @@ jobs: - name: Create universal run: | - [[ "${{ matrix.target }}" == *"debug"* ]] && target='.debug' + [[ "${{ matrix.target }}" == *"release_debug"* ]] && target='.debug' cd godot - intel=bin/godot.macos.*.x86_64 - arm=bin/godot.macos.*.arm64 - lipo -create $intel $arm -output "bin/godot.macos.opt$target.universal" - strip "bin/godot.macos.opt$target.universal" + intel=bin/godot.osx.*.x86_64 + arm=bin/godot.osx.*.arm64 + lipo -create $intel $arm -output "bin/godot.osx.opt$target.universal" + strip "bin/godot.osx.opt$target.universal" - name: Upload artifact uses: bend-n/godot-builds/.github/actions/upload-artifact@main @@ -170,8 +154,8 @@ jobs: web: strategy: matrix: - target: [template_release, template_debug] - flags: [dlink_enabled=yes, ""] + target: [release] + flags: [gdnative_enabled=yes, threads_enabled=yes, ""] name: JS temps runs-on: ubuntu-20.04 @@ -195,20 +179,24 @@ jobs: uses: bend-n/godot-builds/.github/actions/upload-artifact@main with: path: godot/bin/*.zip + name: ${{ inputs.name }}-${{ matrix.target }}-${{ matrix.flags }} templates: needs: [web, macos, windows, linux, android] name: Bundle all templates - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 env: tmps: "templates" steps: - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 - name: List all downloaded files run: ls -R + - name: flatten + run: find . -mindepth 2 -type f -exec mv -t . -i '{}' + + - name: Getdot uses: actions/checkout@v3 with: @@ -222,36 +210,32 @@ jobs: bug="template_debug" mkdir -vp "$tmps" echo "Preparing linux" - linux="godot.linuxbsd" - mv "linux/$linux.$bug.x86_64" "$tmps/linux_debug.x86_64" - mv "linux/$linux.$rel.x86_64" "$tmps/linux_release.x86_64" + linux="godot.x11.opt" + mv "$linux.64" "$tmps/linux_x11_debug.x86_64" + mv "$linux.debug.64" "$tmps/linux_x11_release.x86_64" echo "Preparing windows" - windows="godot.windows" - mv "windows/$windows.$bug.x86_64.console.exe" "$tmps/windows_debug_x86_64_console.exe" - mv "windows/$windows.$bug.x86_64.exe" "$tmps/windows_debug_x86_64.exe" - mv "windows/$windows.$rel.x86_64.console.exe" "$tmps/windows_release_x86_64_console.exe" - mv "windows/$windows.$rel.x86_64.exe" "$tmps/windows_release_x86_64.exe" + windows="godot.windows.opt" + # mv "windows/$windows.debug.64.exe" "$tmps/windows_debug_x86_64.exe" + mv "$windows.64.exe" "$tmps/windows_release_x86_64.exe" echo "Preparing android" - mv "android/android_debug.apk" "$tmps/android_debug.apk" - mv "android/android_release.apk" "$tmps/android_release.apk" + # mv "android/android_debug.apk" "$tmps/android_debug.apk" + mv "android_release.apk" "$tmps/android_release.apk" echo "Preparing macos" - mac="godot.macos.opt" - cp -r "godot-repo/misc/dist/macos_template.app" "." - mkdir -p "macos_template.app/Contents/MacOS" - cp "macos/$mac.universal" "macos_template.app/Contents/MacOS/godot_macos_release.universal" - cp "macos/$mac.debug.universal" "macos_template.app/Contents/MacOS/godot_macos_debug.universal" - chmod +x macos_template.app/Contents/MacOS/godot_macos_*.universal - zip -q -9 -r "$tmps/macos.zip" "macos_template.app" + mac="godot.osx.opt" + cp -r "godot-repo/misc/dist/osx_template.app" "." + mkdir -p "osx_template.app/Contents/MacOS" + cp "$mac.universal" "osx_template.app/Contents/MacOS/godot_osx_release.64" + # cp "macos/$mac.debug.universal" "osx_template.app/Contents/MacOS/godot_osx_debug.64" + chmod +x osx_template.app/Contents/MacOS/*.64 + zip -q -9 -r "$tmps/osz.zip" "osx_template.app" echo "Preparing web" - web="godot.web" - mv "web/$web.$rel.wasm32.zip" "$tmps/web_release.zip" - mv "web/$web.$bug.wasm32.zip" "$tmps/web_debug.zip" - mv "web/$web.$rel.wasm32.dlink.zip" "$tmps/web_dlink_release.zip" - mv "web/$web.$bug.wasm32.dlink.zip" "$tmps/web_dlink_debug.zip" + web="godot.javascript.opt" + mv "$web.zip" "$tmps/webassembly_release.zip" + mv "$web.gdnative.zip" "$tmps/webassembly_gdnative_release.zip" - name: Prepare bundle run: cd "${tmps}" && zip -qr9 templates.tpz ./* @@ -260,22 +244,27 @@ jobs: uses: bend-n/godot-builds/.github/actions/upload-artifact@main with: path: ${{ env.tmps }}/templates.tpz + name: templates editor: + strategy: + matrix: + platform: [server, linuxbsd] name: Linux editor runs-on: ubuntu-20.04 steps: - name: Compilation uses: bend-n/godot-builds/.github/actions/build-godot@main with: - platform: linuxbsd - target: editor + platform: ${{ matrix.platform }} + target: release_debug + tools: "yes" - name: Upload artifact uses: bend-n/godot-builds/.github/actions/upload-artifact@main with: - name: linuxbsd-editor-release - path: godot/bin/*.x86_64 + name: ${{ matrix.platform }}-editor-release + path: godot/bin/*.64 image: if: inputs.make-release == 'yes' |