Skip to content

Commit 9cc8129

Browse files
authored
Merge pull request #1806 from shimat/wasm_update
update emscripten
2 parents 5c0f951 + ca8c0db commit 9cc8129

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

.github/workflows/wasm.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ on:
1010
env:
1111
DEBIAN_FRONTEND: noninteractive
1212
OPENCV_VERSION: 4.13.0
13-
EM_VERSION: 3.1.32
13+
OPENCV_CACHE_VERSION: 1
14+
EM_VERSION: 4.0.23
1415
EM_CACHE_FOLDER: 'emsdk-cache'
1516

1617
jobs:
1718
build:
1819

19-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2021

2122
steps:
2223
- uses: actions/checkout@v6
@@ -25,8 +26,6 @@ jobs:
2526

2627
- name: Install dependencies
2728
run: |
28-
pwd
29-
echo ${GITHUB_WORKSPACE}
3029
current_path=$(pwd)
3130
sudo apt-get update -y
3231
sudo apt-get install -y --no-install-recommends \
@@ -40,7 +39,7 @@ jobs:
4039
cmake \
4140
libtbb-dev \
4241
libatlas-base-dev \
43-
libgtk2.0-dev \
42+
libgtk-3-dev \
4443
libavcodec-dev \
4544
libavformat-dev \
4645
libswscale-dev \
@@ -60,7 +59,7 @@ jobs:
6059
uses: actions/cache@v5
6160
with:
6261
path: ${{ github.workspace }}/opencv_wasm/
63-
key: opencv-${{ env.OPENCV_VERSION }}-wasm
62+
key: opencv-${{ env.OPENCV_VERSION }}-wasm-${{ env.EM_VERSION }}-rev${{ env.OPENCV_CACHE_VERSION }}
6463

6564
- name: Setup Emscripten cache
6665
id: cache-system-libraries

0 commit comments

Comments
 (0)