From 90f684ce91cd02af7f175fcb242ead6875bf614a Mon Sep 17 00:00:00 2001 From: Davide Bettio Date: Sat, 7 Oct 2023 12:11:23 +0200 Subject: [PATCH 1/3] wasm-build CI workflow: remove unneeded && Just avoid cluttering scripts with `&&`. Signed-off-by: Davide Bettio --- .github/workflows/wasm-build.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wasm-build.yaml b/.github/workflows/wasm-build.yaml index a206331bb..ec8f1fcfc 100644 --- a/.github/workflows/wasm-build.yaml +++ b/.github/workflows/wasm-build.yaml @@ -195,14 +195,14 @@ jobs: if: startsWith(github.ref, 'refs/tags/') shell: bash run: | - pushd src/platforms/emscripten/build/src && - ATOMVM_JS=AtomVM-${{ github.ref_name }}.js && - mv AtomVM.js "${ATOMVM_JS}" && - sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256" && - popd && - pushd build/examples/emscripten/ && - SERVER_FILE=wasm_webserver-${{ github.ref_name }}.avm && - mv wasm_webserver.avm "${SERVER_FILE}" && + pushd src/platforms/emscripten/build/src + ATOMVM_JS=AtomVM-${{ github.ref_name }}.js + mv AtomVM.js "${ATOMVM_JS}" + sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256" + popd + pushd build/examples/emscripten/ + SERVER_FILE=wasm_webserver-${{ github.ref_name }}.avm + mv wasm_webserver.avm "${SERVER_FILE}" sha256sum "${SERVER_FILE}" > "${SERVER_FILE}.sha256" - name: Release From 83ac5066fdfc2560b4dfcee98c47f6315bf73ae6 Mon Sep 17 00:00:00 2001 From: Davide Bettio Date: Sat, 7 Oct 2023 12:14:27 +0200 Subject: [PATCH 2/3] wasm-build CI workflow: publish AtomVM.wasm and AtomVM.worker.js too AtomVM.js, AtomVM.worker.js and AtomVM.wasm are all needed. Also remove the webserver example app. Signed-off-by: Davide Bettio --- .github/workflows/wasm-build.yaml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wasm-build.yaml b/.github/workflows/wasm-build.yaml index ec8f1fcfc..f43da88bf 100644 --- a/.github/workflows/wasm-build.yaml +++ b/.github/workflows/wasm-build.yaml @@ -194,16 +194,17 @@ jobs: - name: "Rename and write sha256sum" if: startsWith(github.ref, 'refs/tags/') shell: bash + working-directory: src/platforms/emscripten/build/src run: | - pushd src/platforms/emscripten/build/src ATOMVM_JS=AtomVM-${{ github.ref_name }}.js mv AtomVM.js "${ATOMVM_JS}" sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256" - popd - pushd build/examples/emscripten/ - SERVER_FILE=wasm_webserver-${{ github.ref_name }}.avm - mv wasm_webserver.avm "${SERVER_FILE}" - sha256sum "${SERVER_FILE}" > "${SERVER_FILE}.sha256" + ATOMVM_WORKER_JS=AtomVM.worker-${{ github.ref_name }}.js + mv AtomVM.worker.js "${ATOMVM_WORKER_JS}" + sha256sum "${ATOMVM_WORKER_JS}" > "${ATOMVM_WORKER_JS}.sha256" + ATOMVM_WASM=AtomVM-${{ github.ref_name }}.wasm + mv AtomVM.wasm "${ATOMVM_WASM}" + sha256sum "${ATOMVM_WASM}" > "${ATOMVM_WASM}.sha256" - name: Release uses: softprops/action-gh-release@v1 @@ -214,5 +215,7 @@ jobs: files: | src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.js src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.js.sha256 - build/examples/emscripten/wasm_webserver-${{ github.ref_name }}.avm - build/examples/emscripten/wasm_webserver-${{ github.ref_name }}.avm.sha256 + src/platforms/emscripten/build/src/AtomVM.worker-${{ github.ref_name }}.js + src/platforms/emscripten/build/src/AtomVM.worker-${{ github.ref_name }}.js.sha256 + src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.wasm + src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.wasm.sha256 From 10dd7dba0522bec65bfffc0557f781e7b189218e Mon Sep 17 00:00:00 2001 From: Davide Bettio Date: Sat, 7 Oct 2023 17:58:39 +0200 Subject: [PATCH 3/3] wasm-build workflow: release also node version Publish node version, and add suffix (node, web) to both. Signed-off-by: Davide Bettio --- .github/workflows/wasm-build.yaml | 51 ++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/.github/workflows/wasm-build.yaml b/.github/workflows/wasm-build.yaml index f43da88bf..6abd02509 100644 --- a/.github/workflows/wasm-build.yaml +++ b/.github/workflows/wasm-build.yaml @@ -126,6 +126,35 @@ jobs: node src/AtomVM.js ../../../../build/tests/libs/alisp/test_alisp.avm node src/AtomVM.js ../../../../build/tests/libs/eavmlib/test_eavmlib.avm + - name: "Rename and write sha256sum (node)" + if: startsWith(github.ref, 'refs/tags/') + shell: bash + working-directory: src/platforms/emscripten/build/src + run: | + ATOMVM_JS=AtomVM-node-${{ github.ref_name }}.js + mv AtomVM.js "${ATOMVM_JS}" + sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256" + ATOMVM_WORKER_JS=AtomVM.worker-node-${{ github.ref_name }}.js + mv AtomVM.worker.js "${ATOMVM_WORKER_JS}" + sha256sum "${ATOMVM_WORKER_JS}" > "${ATOMVM_WORKER_JS}.sha256" + ATOMVM_WASM=AtomVM-node-${{ github.ref_name }}.wasm + mv AtomVM.wasm "${ATOMVM_WASM}" + sha256sum "${ATOMVM_WASM}" > "${ATOMVM_WASM}.sha256" + + - name: "Release (node)" + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') + with: + draft: true + fail_on_unmatched_files: true + files: | + src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.js + src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.js.sha256 + src/platforms/emscripten/build/src/AtomVM.worker-node-${{ github.ref_name }}.js + src/platforms/emscripten/build/src/AtomVM.worker-node-${{ github.ref_name }}.js.sha256 + src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.wasm + src/platforms/emscripten/build/src/AtomVM-node-${{ github.ref_name }}.wasm.sha256 + wasm_build_web: runs-on: ubuntu-latest container: emscripten/emsdk @@ -191,31 +220,31 @@ jobs: docker run --network host -v $PWD:/mnt -w /mnt cypress/included:12.17.1 --browser chrome killall AtomVM - - name: "Rename and write sha256sum" + - name: "Rename and write sha256sum (web)" if: startsWith(github.ref, 'refs/tags/') shell: bash working-directory: src/platforms/emscripten/build/src run: | - ATOMVM_JS=AtomVM-${{ github.ref_name }}.js + ATOMVM_JS=AtomVM-web-${{ github.ref_name }}.js mv AtomVM.js "${ATOMVM_JS}" sha256sum "${ATOMVM_JS}" > "${ATOMVM_JS}.sha256" - ATOMVM_WORKER_JS=AtomVM.worker-${{ github.ref_name }}.js + ATOMVM_WORKER_JS=AtomVM.worker-web-${{ github.ref_name }}.js mv AtomVM.worker.js "${ATOMVM_WORKER_JS}" sha256sum "${ATOMVM_WORKER_JS}" > "${ATOMVM_WORKER_JS}.sha256" - ATOMVM_WASM=AtomVM-${{ github.ref_name }}.wasm + ATOMVM_WASM=AtomVM-web-${{ github.ref_name }}.wasm mv AtomVM.wasm "${ATOMVM_WASM}" sha256sum "${ATOMVM_WASM}" > "${ATOMVM_WASM}.sha256" - - name: Release + - name: "Release (web)" uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: draft: true fail_on_unmatched_files: true files: | - src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.js - src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.js.sha256 - src/platforms/emscripten/build/src/AtomVM.worker-${{ github.ref_name }}.js - src/platforms/emscripten/build/src/AtomVM.worker-${{ github.ref_name }}.js.sha256 - src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.wasm - src/platforms/emscripten/build/src/AtomVM-${{ github.ref_name }}.wasm.sha256 + src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.js + src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.js.sha256 + src/platforms/emscripten/build/src/AtomVM.worker-web-${{ github.ref_name }}.js + src/platforms/emscripten/build/src/AtomVM.worker-web-${{ github.ref_name }}.js.sha256 + src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.wasm + src/platforms/emscripten/build/src/AtomVM-web-${{ github.ref_name }}.wasm.sha256