升级maos版本&修正wasm编译错误

puerts · Jun 24, 2024 · 68906d1 · 68906d1
1 parent 56e7125
commit 68906d1
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/.github/workflows/build_quickjs.yml b/.github/workflows/build_quickjs.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build_macos:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -33,7 +33,7 @@ jobs:
 
   build_macos_dll:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -49,7 +49,7 @@ jobs:
 
   build_macos_arm64:
     name: macOS_arm64
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -66,7 +66,7 @@ jobs:
 
   build_ios:
     name: iOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script

diff --git a/.github/workflows/build_quickjs_qjs_ns.yml b/.github/workflows/build_quickjs_qjs_ns.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   build_macos:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -33,7 +33,7 @@ jobs:
 
   build_macos_dll:
     name: macOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -49,7 +49,7 @@ jobs:
 
   build_macos_arm64:
     name: macOS_arm64
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -66,7 +66,7 @@ jobs:
 
   build_ios:
     name: iOS
-    runs-on: macos-11
+    runs-on: macos-12
     steps:
     - uses: actions/checkout@v3
     - name: Run build script
@@ -148,6 +148,29 @@ jobs:
       with:
         name: qjs_v8_bin
         path: ~/qjs/**/*
+
+  build_wasm:
+    name: wasm 
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install LibC++
+      run: |
+        sudo apt-get update
+        sudo apt-get install clang
+        sudo apt-get install build-essential
+        sudo apt-get install libc++-dev
+        sudo apt-get install libc++abi-dev
+    - name: Run build script
+      run: |
+        cd $GITHUB_WORKSPACE
+        chmod +x make_wasm.sh
+        ./make_wasm.sh 1
+        cp -r $GITHUB_WORKSPACE/qjs ~/
+    - uses: actions/upload-artifact@v3
+      with:
+        name: qjs_v8_bin
+        path: ~/qjs/**/*
 
   build_window_dll:
     name: Windows

diff --git a/make_wasm.sh b/make_wasm.sh
@@ -14,7 +14,7 @@ cd ..
 
 mkdir -p build_wasm && cd build_wasm
 emcmake cmake -DQJS_NS=${QJSNS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON ../
-cd ..
 emmake make
+cd ..
 mkdir -p ./qjs/quickjs/Lib/wasm/
 cp build_wasm/libquickjs.a ./qjs/quickjs/Lib/wasm/