From fe5fc2d133be9716b6cc114da678340018c9630b Mon Sep 17 00:00:00 2001 From: Ivar Date: Wed, 15 Jan 2025 14:04:15 +0000 Subject: [PATCH 1/3] fix package json --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index 460ce20..192729d 100644 --- a/js/package.json +++ b/js/package.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@rollup/plugin-commonjs": "^26.0.1", - "@rollup/plugin-node-resolve": "^15.2 + "@rollup/plugin-node-resolve": "^15.2", "@rollup/plugin-typescript": "^11.1.6", "del-cli": "^5.1.0", "rollup": "^2.41.0", From 2ed1cc1766a3896664a54d316237c7af4076a1cd Mon Sep 17 00:00:00 2001 From: Ivar Date: Wed, 15 Jan 2025 14:04:38 +0000 Subject: [PATCH 2/3] add js built task GH CI workflow --- .github/workflows/ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca34bd9..745998b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,16 @@ jobs: run: mkdir -p build && cd build && CC="$(which clang-15)" CXX="$(which clang++-15)" cmake -GNinja -DCOMPILE_TARGET=virtual .. && ninja working-directory: cpp + build-js-app: + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 18 + - name: Build js app + run: npm install && npm run build + working-directory: js + build-containers: runs-on: ubuntu-20.04 container: ghcr.io/microsoft/ccf/app/dev/sgx:ccf-5.0.0 From 9c126c622bdf6d80909af24ebacb3d6a749231e8 Mon Sep 17 00:00:00 2001 From: Ivar Date: Wed, 15 Jan 2025 14:05:03 +0000 Subject: [PATCH 3/3] bump nodejs lts version --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a799538..e768037 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1,3 @@ FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 -RUN curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash - && sudo apt-get install -y nodejs +RUN curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - && sudo apt-get install -y nodejs