mirror of
https://github.com/lihop/godot-xterm.git
synced 2025-07-13 00:14:09 +02:00
Use default export templates for HTML5
Changes Emscripten SDK version to match that used to compile the default export templates used by Godot 3.4 (in this case 2.0.25 as can be seen here: https://github.com/godotengine/build-containers/blob/3.4/Dockerfile.javascript). This means we no longer need to compile custom export templates when exporting HTML5 for Godot 3.4. Exports from other Godot versions may requiring compiling the GDNative library with a different version of the Emscripten SDK.
This commit is contained in:
parent
03583c0a1b
commit
5f7dc2c247
15 changed files with 52 additions and 119 deletions
74
.github/workflows/main.yml
vendored
74
.github/workflows/main.yml
vendored
|
@ -41,7 +41,10 @@ jobs:
|
|||
- name: Build godot-cpp bindings
|
||||
if: steps.cache-submodules.outputs.cache-hit != 'true'
|
||||
working-directory: addons/godot_xterm/native
|
||||
run: UID_GID="$(id -u):$(id -g)" docker-compose run -e TARGET=${{ matrix.target }} -e BITS=${{ matrix.bits }} godot-cpp-linux
|
||||
run: |
|
||||
docker-compose build godot-cpp-linux
|
||||
UID_GID="$(id -u):$(id -g)" docker-compose run -e TARGET=${{ matrix.target }} -e BITS=${{ matrix.bits }} godot-cpp-linux
|
||||
|
||||
- name: Build libuv
|
||||
if: steps.cache-submodules.outputs.cache-hit != 'true'
|
||||
working-directory: addons/godot_xterm/native
|
||||
|
@ -100,7 +103,7 @@ jobs:
|
|||
if: ${{ matrix.platform == 'javascript' }}
|
||||
uses: mymindstorm/setup-emsdk@v11
|
||||
with:
|
||||
version: 3.1.5
|
||||
version: 2.0.25
|
||||
actions-cache-folder: emsdk-cache-${{ matrix.target }}
|
||||
- name: Install additional javascript build dependencies
|
||||
if: ${{ matrix.platform == 'javascript' }}
|
||||
|
@ -166,43 +169,9 @@ jobs:
|
|||
addons/godot_xterm/native/bin/*.dylib
|
||||
addons/godot_xterm/native/bin/*.dll
|
||||
|
||||
# GDNative HTML5 export templates aren't provided so we must build them
|
||||
export_template:
|
||||
name: 'Export Template'
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
target: [ release, debug ]
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: recursive
|
||||
- name: Get godot submodule commit hash
|
||||
shell: bash
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||
run: |
|
||||
echo ::set-env name=GODOT_COMMIT_HASH::$(git ls-tree HEAD misc/export_templates/godot -l | cut -d\ -f3)
|
||||
- name: Cache export template
|
||||
uses: actions/cache@v2
|
||||
id: cache-export-template
|
||||
env:
|
||||
cache-name: cache-export-template
|
||||
with:
|
||||
path: misc/export_templates/godot/bin
|
||||
key: godot-${{ env.GODOT_COMMIT_HASH }}-${{ matrix.target }}-v${{ env.EXPORT_TEMPLATE_CACHE_VERSION }}
|
||||
- name: Build template in docker container
|
||||
if: steps.cache-export-template.outputs.cache-hit != 'true'
|
||||
run: cd misc/export_templates && ./build.sh -t ${{ matrix.target }}
|
||||
- name: Upload export template
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: html5-gdnative-export-templates
|
||||
path: misc/export_templates/godot/bin/webassembly_gdnative_${{matrix.target}}.zip
|
||||
|
||||
html5_export:
|
||||
name: 'HTML5 Export'
|
||||
needs: [ build_docker, build_native, export_template ]
|
||||
needs: [ build_docker, build_native ]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
@ -210,28 +179,27 @@ jobs:
|
|||
submodules: recursive
|
||||
- name: Setup Godot
|
||||
uses: lihop/setup-godot@v1.0.1
|
||||
with:
|
||||
export-templates: true
|
||||
- name: Install binary build artifacts
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: libgodot-xterm-release
|
||||
path: addons/godot_xterm/native/bin
|
||||
- name: Install html5 export templates
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: html5-gdnative-export-templates
|
||||
path: misc/export_templates/godot/bin
|
||||
- name: Create export directory
|
||||
run: mkdir -p docs/demo
|
||||
- name: Import assets
|
||||
shell: bash
|
||||
# The GodotXterm plugin will be disabled the first time we run the editor as resources that it depends
|
||||
# (e.g. icons) will not have been imported yet so the plugin will fail to load. Without the plugin
|
||||
# enabled resources imported by GodotXterm import plugins (e.g. .cast) will not be imported. Therefore,
|
||||
# we need to re-enable the plugin by checking out project.godot and running the editor again.
|
||||
run: godot --editor .github/import_assets.tscn && git checkout project.godot && godot --editor .github/import_assets.tscn
|
||||
- name: Export html5
|
||||
run: godot --export HTML5
|
||||
# FIXME: HTML5 Exports not properly exporting .cast files.
|
||||
# So skip upload for now.
|
||||
#- name: Upload export
|
||||
# uses: actions/upload-artifact@v2
|
||||
# with:
|
||||
# name: html5-demo
|
||||
# path: docs/demo
|
||||
|
||||
run: godot --no-window --export HTML5
|
||||
- name: Upload export
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: html5-demo
|
||||
path: docs/demo
|
||||
|
||||
test:
|
||||
name: 'Test'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue