Merge branch 'gh-fix-web'
This commit is contained in:
commit
b57528e4dc
|
@ -20,13 +20,13 @@ jobs:
|
||||||
limboai-sha: ${{ steps.cache-sha.outputs.limboai-sha }}
|
limboai-sha: ${{ steps.cache-sha.outputs.limboai-sha }}
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
|
@ -74,13 +74,13 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
@ -132,13 +132,13 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
|
@ -78,13 +78,13 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
@ -143,13 +143,13 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
|
@ -102,13 +102,13 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
|
@ -121,13 +121,13 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
@ -203,13 +203,13 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
|
@ -76,13 +76,13 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ env.GODOT_TREEISH }}
|
ref: ${{ env.GODOT_TREEISH }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
|
|
||||||
|
|
|
@ -27,45 +27,57 @@ env:
|
||||||
SCONS_CACHE_LIMIT: 4096
|
SCONS_CACHE_LIMIT: 4096
|
||||||
# With `lto=full` VM seems to run out of ram and build fails
|
# With `lto=full` VM seems to run out of ram and build fails
|
||||||
SCONSFLAGS: use_static_cpp=yes debug_symbols=no lto=thin optimize=size verbose=yes warnings=extra werror=yes tests=no
|
SCONSFLAGS: use_static_cpp=yes debug_symbols=no lto=thin optimize=size verbose=yes warnings=extra werror=yes tests=no
|
||||||
EM_VERSION: 3.1.18
|
EM_VERSION: 3.1.45
|
||||||
EM_CACHE_FOLDER: "emsdk-cache"
|
EM_CACHE_FOLDER: "emsdk-cache"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
# Workaround for issue: https://github.com/mymindstorm/setup-emsdk/issues/20
|
||||||
|
init-emscripten:
|
||||||
|
name: Init Emscripten
|
||||||
|
runs-on: "ubuntu-20.04"
|
||||||
|
steps:
|
||||||
|
- name: Set up Emscripten
|
||||||
|
uses: mymindstorm/setup-emsdk@v12
|
||||||
|
with:
|
||||||
|
version: ${{env.EM_VERSION}}
|
||||||
|
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
|
||||||
|
|
||||||
web-builds:
|
web-builds:
|
||||||
runs-on: "ubuntu-20.04"
|
runs-on: "ubuntu-20.04"
|
||||||
name: ${{ matrix.name }}
|
name: ${{ matrix.name }}
|
||||||
|
needs: init-emscripten
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- name: Template (release)
|
- name: Template (release)
|
||||||
target: template_release
|
target: template_release
|
||||||
dlink_enabled: no
|
dlink_enabled: false
|
||||||
|
|
||||||
- name: Template (release, dlink_enabled=true)
|
- name: Template (release, dlink_enabled=true)
|
||||||
target: template_release
|
target: template_release
|
||||||
dlink_enabled: yes
|
dlink_enabled: true
|
||||||
|
|
||||||
- name: Template (debug)
|
- name: Template (debug)
|
||||||
target: template_debug
|
target: template_debug
|
||||||
dlink_enabled: no
|
dlink_enabled: false
|
||||||
|
|
||||||
- name: Template (debug, dlink_enabled=true)
|
- name: Template (debug, dlink_enabled=true)
|
||||||
target: template_debug
|
target: template_debug
|
||||||
dlink_enabled: yes
|
dlink_enabled: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CACHE_NAME: godot.web.${{matrix.target}}${{ matrix.dlink_enabled == true && '.dlink' || '' }}
|
CACHE_NAME: godot.web.${{matrix.target}}${{ matrix.dlink_enabled == true && '.dlink' || '' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
@ -73,7 +85,13 @@ jobs:
|
||||||
# Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
|
# Inits GODOT_VERSION, LIMBOAI_VERSION and NAME_PREFIX environment variables.
|
||||||
- uses: ./modules/limboai/.github/actions/init-version
|
- uses: ./modules/limboai/.github/actions/init-version
|
||||||
|
|
||||||
- name: Set up Emscripten latest
|
# - name: Set up Emscripten cache
|
||||||
|
# uses: actions/cache@v3
|
||||||
|
# with:
|
||||||
|
# path: ${{env.EM_CACHE_FOLDER}}
|
||||||
|
# key: ${{env.EM_VERSION}}-${{runner.os}}-libs
|
||||||
|
|
||||||
|
- name: Set up Emscripten
|
||||||
uses: mymindstorm/setup-emsdk@v12
|
uses: mymindstorm/setup-emsdk@v12
|
||||||
with:
|
with:
|
||||||
version: ${{env.EM_VERSION}}
|
version: ${{env.EM_VERSION}}
|
||||||
|
|
|
@ -103,13 +103,13 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Clone Godot
|
- name: Clone Godot
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
repository: godotengine/godot
|
repository: godotengine/godot
|
||||||
ref: ${{ inputs.godot-treeish }}
|
ref: ${{ inputs.godot-treeish }}
|
||||||
|
|
||||||
- name: Clone LimboAI module
|
- name: Clone LimboAI module
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
path: modules/limboai
|
path: modules/limboai
|
||||||
ref: ${{ inputs.limboai-treeish }}
|
ref: ${{ inputs.limboai-treeish }}
|
||||||
|
|
Loading…
Reference in New Issue