diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-10-03 16:20:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-03 16:20:05 +0200 |
| commit | 3046a6ce39d755f50207a2c4a1235069a0eb23fb (patch) | |
| tree | d3d6477b628b83765bd1b925b74c9d238eb21f63 /.github/workflows | |
| parent | e404d16929991d1eddd9d37b859d3813be7e18ed (diff) | |
| download | openttd-3046a6ce39d755f50207a2c4a1235069a0eb23fb.tar.xz | |
Change: upgrade Emscripten to 2.0.31 and enable LZMA by default (#9604)
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci-build.yml | 9 | ||||
| -rw-r--r-- | .github/workflows/preview_build.yml | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 3f05869e0..952e860e4 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 container: # If you change this version, change the number in the cache step too. - image: emscripten/emsdk:2.0.10 + image: emscripten/emsdk:2.0.31 steps: - name: Checkout @@ -26,7 +26,12 @@ jobs: uses: actions/cache@v2 with: path: /emsdk/upstream/emscripten/cache - key: 2.0.10-${{ runner.os }} + key: 2.0.31-${{ runner.os }} + + - name: Patch Emscripten to support LZMA + run: | + cd /emsdk/upstream/emscripten + patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch - name: Build (host tools) run: | diff --git a/.github/workflows/preview_build.yml b/.github/workflows/preview_build.yml index 9aea890bc..ad254a493 100644 --- a/.github/workflows/preview_build.yml +++ b/.github/workflows/preview_build.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 container: # If you change this version, change the number in the cache step too. - image: emscripten/emsdk:2.0.10 + image: emscripten/emsdk:2.0.31 # uid=1001(runner) gid=121(docker) options: -u 1001:121 @@ -46,7 +46,12 @@ jobs: uses: actions/cache@v2 with: path: /emsdk/upstream/emscripten/cache - key: 2.0.10-${{ runner.os }} + key: 2.0.31-${{ runner.os }} + + - name: Patch Emscripten to support LZMA + run: | + cd /emsdk/upstream/emscripten + patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch - name: Build (host tools) run: | |