Cleaning up.

Author: agarny

.github/workflows/cd.yml

@@ -197,7 +197,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
   webassembly:
     name: WebAssembly
-    runs-on: macos-14
+    runs-on: ubuntu-22.04
     env:
       BUILDCACHE_ACCURACY: STRICT
       BUILDCACHE_COMPRESS_FORMAT: ZSTD
@@ -208,7 +208,7 @@ jobs:
       - name: Set the timezone to New Zealand
         uses: szenius/set-timezone@v2.0
         with:
-          timezoneMacos: 'Pacific/Auckland'
+          timezoneLinux: 'Pacific/Auckland'
       - name: Check out libOpenCOR
         uses: actions/checkout@v4
       - name: Install CMake and Ninja
@@ -218,7 +218,7 @@ jobs:
         with:
           cache_key: cd-webassembly
       - name: Install Emscripten
-        run: brew install emscripten
+        uses: mymindstorm/setup-emsdk@v14
       - name: Configure libOpenCOR
         run: cmake -G Ninja -S . -B build -DBUILD_TYPE=Release -DCODE_ANALYSIS=OFF -DCODE_COVERAGE=OFF -DDOCUMENTATION=OFF -DJAVASCRIPT_BINDINGS=ON -DJAVASCRIPT_UNIT_TESTING=OFF -DMEMORY_CHECKS=OFF -DPYTHON_BINDINGS=OFF -DPYTHON_UNIT_TESTING=OFF -DSHARED_LIBS=OFF -DUNIT_TESTING=OFF
       - name: Build WebAssembly
@@ -228,12 +228,23 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: WebAssembly
-          path: ./build/libopencor*
+          path: ./build/libopencor-*
       - name: Release WebAssembly
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         uses: softprops/action-gh-release@v2
         with:
-          files: ./build/libopencor*
+          files: ./build/libopencor-*
+      - name: Deploy to https://opencor.ws/libopencor/downloads/wasm
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        uses: milanmk/actions-file-deployer@master
+        with:
+          remote-protocol: sftp
+          remote-host: ${{ secrets.REMOTE_HOST }}
+          remote-user: ${{ secrets.REMOTE_USER }}
+          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          local-path: ./build/src/bindings/javascript/build/src/wasm
+          remote-path: /home/www/opencor.ws/libopencor/downloads/wasm
+          sync: full
       - name: Publish libOpenCOR
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         run: |

VERSION.txt

@@ -1 +1 @@
-0.20250924.4
+0.20250925.0

src/CMakeLists.txt

@@ -297,13 +297,11 @@ if(EMSCRIPTEN)
 
     # Package our JavaScript bindings, if possible.
 
-    set(CMAKE_MAIN_BINARY_DIR ${CMAKE_BINARY_DIR}/../../../..)
-
     find_program(NPM_EXE NAMES ${PREFERRED_NPM_NAMES} npm)
 
     if(NPM_EXE)
         set(TGZ_FILENAME ${REAL_CMAKE_PROJECT_NAME}-${PROJECT_VERSION}.tgz)
-        set(TGZ_FILE ${CMAKE_MAIN_BINARY_DIR}/${TGZ_FILENAME})
+        set(TGZ_FILE ${CMAKE_BINARY_DIR}/../../../../${TGZ_FILENAME})
 
         add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
                            COMMAND ${CMAKE_COMMAND} -E make_directory dist
@@ -318,8 +316,9 @@ if(EMSCRIPTEN)
     # Copy our generated .js file over so that it can be deployed.
 
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E make_directory wasm
                        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_PROJECT_NAME}.js
-                                                        ${CMAKE_MAIN_BINARY_DIR}/${CMAKE_PROJECT_NAME}.js)
+                                                        wasm/${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}.js)
 
     # Copy our generated .js file over so that it can be used by our test Web page.