Github action test

cross-language-cpp · Nov 24, 2023 · 69b168c · 69b168c
1 parent 0d1ad26
commit 69b168c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,10 +136,13 @@ jobs:
       uses: mymindstorm/setup-emsdk@v11
       with:
         version: 3.1.44
+    - name: Use local djinni djinni
+      if: ${{ github.ref != 'refs/heads/master' }}
+      run: export CMAKE_DJINNI_OPT="-DDJINNI_EXECUTABLE=$(pwd)/bin/djinni"
     - name: Report cmake version
       run: cmake --version
     - name: Configure cmake
-      run: cmake -S . -B build -DDJINNI_WITH_WASM=ON
+      run: cmake  -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -S . -B build -DDJINNI_WITH_WASM=ON -DDJINNI_EXECUTABLE=$(pwd)/bin
     - name: Build release
       run: cmake --build build --parallel $(nproc) --config Release
 

diff --git a/bin/djinni b/bin/djinni