GHA: Remove no longer needed workaround in web builds
This commit is contained in:
parent
37d3dcd988
commit
0be16edee0
|
@ -162,7 +162,7 @@ jobs:
|
||||||
|
|
||||||
- name: Set up Emscripten
|
- name: Set up Emscripten
|
||||||
if: matrix.opts.platform == 'web'
|
if: matrix.opts.platform == 'web'
|
||||||
uses: mymindstorm/setup-emsdk@v12
|
uses: mymindstorm/setup-emsdk@v14
|
||||||
with:
|
with:
|
||||||
version: ${{env.EM_VERSION}}
|
version: ${{env.EM_VERSION}}
|
||||||
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
|
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
|
||||||
|
|
|
@ -31,21 +31,9 @@ env:
|
||||||
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:
|
||||||
|
@ -85,14 +73,14 @@ 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 cache
|
- name: Set up Emscripten cache
|
||||||
# uses: actions/cache@v3
|
uses: actions/cache@v3
|
||||||
# with:
|
with:
|
||||||
# path: ${{env.EM_CACHE_FOLDER}}
|
path: ${{env.EM_CACHE_FOLDER}}
|
||||||
# key: ${{env.EM_VERSION}}-${{runner.os}}-libs
|
key: ${{env.EM_VERSION}}-${{runner.os}}-libs
|
||||||
|
|
||||||
- name: Set up Emscripten
|
- name: Set up Emscripten
|
||||||
uses: mymindstorm/setup-emsdk@v12
|
uses: mymindstorm/setup-emsdk@v14
|
||||||
with:
|
with:
|
||||||
version: ${{env.EM_VERSION}}
|
version: ${{env.EM_VERSION}}
|
||||||
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
|
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
|
||||||
|
|
Loading…
Reference in New Issue