Skip to content

Commit

Permalink
Update Emscripten installation and version requirements. (#2568)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevingpqi123 authored Nov 6, 2024
1 parent e8a4f6d commit 0083973
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 29 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
path: |
web/emsdk
web/node_modules
key: libpag-environment-web-20231130
key: libpag-environment-web-20241106
restore-keys: libpag-environment-web-

- name: Get Third-Party Cache
Expand All @@ -173,10 +173,16 @@ jobs:
run: |
cd web
npm install
git clone https://github.com/emscripten-core/emsdk.git
if [ ! -d "emsdk" ]; then
git clone https://github.com/emscripten-core/emsdk.git
else
cd emsdk
git pull
cd ..
fi
cd emsdk
./emsdk install 3.1.20
./emsdk activate 3.1.20
./emsdk install 3.1.71
./emsdk activate 3.1.71
shell: bash

- name: Run depsync
Expand All @@ -198,7 +204,7 @@ jobs:
path: |
web/emsdk
web/node_modules
key: libpag-environment-web-20231130
key: libpag-environment-web-20241106

- name: Save Third-Party Cache
if: ${{ (github.event_name == 'push') && (steps.third-party-cache.outputs.cache-hit != 'true') }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ versions, you can download the precompiled libraries from [here](https://github.
- CMake 3.13.0+
- QT 5.13.0+
- NDK 19.2+ (**19.2.5345600 recommended**)
- Emscripten 3.1.20+ (**3.1.20 recommended**)
- Emscripten 3.1.58+

### Dependency Management

Expand Down
2 changes: 1 addition & 1 deletion README.zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ Web 端更多接入方式请参考:[Web端接入指南](https://pag.io/docs/sd
- CMake 3.13.0+
- QT 5.13.0+
- NDK 19.2+ (**推荐 19.2.5345600 版本**)
- Emscripten 3.1.20+ (**推荐 3.1.20 版本**)
- Emscripten 3.1.58+

### 依赖管理

Expand Down
2 changes: 1 addition & 1 deletion ohos/libpag/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ versions, you can download the precompiled libraries from [here](https://github.
- CMake 3.13.0+
- QT 5.13.0+
- NDK 19.2+ (**19.2.5345600 recommended**)
- Emscripten 3.1.20+ (**3.1.20 recommended**)
- Emscripten 3.1.58+

### Dependency Management

Expand Down
2 changes: 1 addition & 1 deletion sync_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd $(dirname $0)
if [[ `uname` == 'Darwin' ]]; then
if [ ! $(which emcc) ]; then
echo "emscripten not found. Trying to install..."
./web/script/install-emscripten.sh
brew install emscripten
fi
fi

Expand Down
20 changes: 0 additions & 20 deletions web/script/install-emscripten.sh

This file was deleted.

0 comments on commit 0083973

Please sign in to comment.