From a1414db178e096cc51d1cd8ce364d2f00eab8ebe Mon Sep 17 00:00:00 2001 From: Geoffrey Cohler Date: Wed, 16 Jul 2025 06:15:31 -0400 Subject: [PATCH 1/3] Add embue to build --- .github/workflows/build-sdk-staging-from-default.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-sdk-staging-from-default.yml b/.github/workflows/build-sdk-staging-from-default.yml index f3da5ae..60d4e85 100644 --- a/.github/workflows/build-sdk-staging-from-default.yml +++ b/.github/workflows/build-sdk-staging-from-default.yml @@ -66,16 +66,19 @@ jobs: cp emscript-content/.clang-format emscript-sdk/ cp emscript-content/tsconfig.base.json emscript-sdk/ - - name: Build emscript cli + - name: Build emscript cli and bue run: | VERSION_WITH_TIMESTAMP=${{ steps.date.outputs.version }}.${{ steps.date.outputs.date }} pushd emscript-tools npm install npm run build-cli + npm run build-bue + mv out/bue/Main.js out/bue/embue npm run postbuild npm run cli-executable sed -i "s/@VERS/$VERSION_WITH_TIMESTAMP/" out/cli/Main.js sed -i "s/@VERS/$VERSION_WITH_TIMESTAMP/" out/cli/bin/emscript + sed -i "s/@VERS/$VERSION_WITH_TIMESTAMP/" out/bue/embue mkdir build cp -r $GITHUB_WORKSPACE/emscript-releng/etc/packages/emscript-cli build/ pushd build/emscript-cli @@ -84,7 +87,8 @@ jobs: cp $GITHUB_WORKSPACE/emscript-tools/out/cli/Main.js bin/main.js cp $GITHUB_WORKSPACE/emscript-tools/out/cli/grammar.css bin/ cp $GITHUB_WORKSPACE/emscript-tools/out/cli/bin/emscript bin/ - chmod +x bin/{main.js,emscript} + cp $GITHUB_WORKSPACE/emscript-tools/out/bue/embue bin/ + chmod +x bin/{main.js,emscript,embue} npm pack . mv emscript-cli-${{ steps.date.outputs.version }}.tgz emscript-cli-$VERSION_WITH_TIMESTAMP.tgz popd From ca7ae561c30d3224db45fff31443c47f1685cc9b Mon Sep 17 00:00:00 2001 From: Geoffrey Cohler Date: Wed, 16 Jul 2025 06:34:54 -0400 Subject: [PATCH 2/3] Add to dependencies --- etc/packages/emscript-cli/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/packages/emscript-cli/package.json b/etc/packages/emscript-cli/package.json index 6a52635..2926aee 100644 --- a/etc/packages/emscript-cli/package.json +++ b/etc/packages/emscript-cli/package.json @@ -11,8 +11,10 @@ "@types/xml2js": "^0.4.14", "commander": "^8.3.0", "he": "^1.2.0", + "joulescope_driver": "^1.9.4", "json5": "^2.2.3", "js-yaml": "^4.1.0", + "plotly.js-dist": "^3.0.1", "sprintf-js": "^1.1.3", "ts-node": "^10.9.2", "unescape-js": "^1.1.4", From 54e9db17ae311d6ec0ed90857ad2dfddd1df6a06 Mon Sep 17 00:00:00 2001 From: Geoffrey Cohler Date: Wed, 16 Jul 2025 07:21:31 -0400 Subject: [PATCH 3/3] bump rev of joulescript driver --- etc/packages/emscript-cli/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/packages/emscript-cli/package.json b/etc/packages/emscript-cli/package.json index 2926aee..baa9a6d 100644 --- a/etc/packages/emscript-cli/package.json +++ b/etc/packages/emscript-cli/package.json @@ -11,7 +11,7 @@ "@types/xml2js": "^0.4.14", "commander": "^8.3.0", "he": "^1.2.0", - "joulescope_driver": "^1.9.4", + "joulescope_driver": "^1.10.0", "json5": "^2.2.3", "js-yaml": "^4.1.0", "plotly.js-dist": "^3.0.1",