diff --git a/.github/workflows/deploy-wasm-emscripten.yml b/.github/workflows/deploy-wasm-emscripten.yml index a176d48..e6f9a6e 100644 --- a/.github/workflows/deploy-wasm-emscripten.yml +++ b/.github/workflows/deploy-wasm-emscripten.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - develop + - main jobs: deploy: @@ -46,13 +46,8 @@ jobs: name: emscripten_build path: ${{ github.workspace }}/emscripten_build - # - name: Upload - # working-directory: ${{ github.workspace }}/build - # run: | - # sshpass -p "${{ secrets.EMSCRIPTEN_DEPLOY_PASSWORD }}" sftp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "${{ secrets.EMSCRIPTEN_DEPLOY_REMOTE }}" << EOF - # put app-demo.html public/www/app-demo.html - # put app-demo.js public/www/app-demo.js - # put app-demo.wasm public/www/app-demo.wasm - # put app-demo.worker.js public/www/app-demo.worker.js - # put app-demo.ww.js public/www/app-demo.ww.js - # EOF +# Download the artifact from the last run on https://github.com/cpvrlab/SLProject4/actions +# Unzip the emscripten_build.zip file +# Upload the files to the public/www folder of the pallas server + + diff --git a/apps/source/AppCommon.cpp b/apps/source/AppCommon.cpp index 1e4e0cc..e3bde80 100644 --- a/apps/source/AppCommon.cpp +++ b/apps/source/AppCommon.cpp @@ -39,7 +39,7 @@ SLDeviceLocation AppCommon::devLoc; std::optional AppCommon::sceneToLoad; SLstring AppCommon::name = "SLProjectApp"; SLstring AppCommon::appTag = "SLProject"; -SLstring AppCommon::version = "4.2.000"; +SLstring AppCommon::version = "4.2.001"; // 7.10.2024 //! ASCII Label: https://patorjk.com/software/taag/#p=display&f=Small%20Slant&t=SLProject%204.2 SLstring AppCommon::asciiLabel = R"(