From 7749ff8fc60c95fef900fd6480798ced9d45b1ea Mon Sep 17 00:00:00 2001 From: acalcutt Date: Wed, 13 Nov 2024 19:24:21 -0500 Subject: [PATCH 1/3] move node .nvmrc file --- .github/workflows/node-ci.yml | 2 +- platform/node/.nvmrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 platform/node/.nvmrc diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index 5a41e4446b..dd81250b30 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -145,7 +145,7 @@ jobs: - name: Use Node.js from nvmrc uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version-file: 'platform/node/.nvmrc' - name: npm ci working-directory: platform/node diff --git a/platform/node/.nvmrc b/platform/node/.nvmrc new file mode 100644 index 0000000000..b393560759 --- /dev/null +++ b/platform/node/.nvmrc @@ -0,0 +1 @@ +23 \ No newline at end of file From 5121f51bb39556bb96955eca320e5a848fade9d3 Mon Sep 17 00:00:00 2001 From: acalcutt Date: Wed, 13 Nov 2024 19:25:12 -0500 Subject: [PATCH 2/3] update abi folder to extract dll for windows to match nvmrc file --- .github/workflows/node-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml index dd81250b30..1d4b6abe2f 100644 --- a/.github/workflows/node-ci.yml +++ b/.github/workflows/node-ci.yml @@ -297,7 +297,7 @@ jobs: GALLIUM_DRIVER: softpipe run: | Invoke-WebRequest https://github.com/pal1000/mesa-dist-win/releases/download/22.3.5/mesa3d-22.3.5-release-msvc.7z -OutFile mesa3d.7z - & 'C:\Program Files\7-Zip\7z.exe' e -olib\node-v115 .\mesa3d.7z x64\opengl32.dll x64\libgallium_wgl.dll x64\libGLESv2.dll x64\libglapi.dll + & 'C:\Program Files\7-Zip\7z.exe' e -olib\node-v131 .\mesa3d.7z x64\opengl32.dll x64\libgallium_wgl.dll x64\libGLESv2.dll x64\libglapi.dll npm test # On PRs make sure that the npm package can be packaged. From 74210a331cb7587cc5e955ee5c35edca60c3fccb Mon Sep 17 00:00:00 2001 From: acalcutt Date: Wed, 13 Nov 2024 20:08:36 -0500 Subject: [PATCH 3/3] Update node-release.yml --- .github/workflows/node-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node-release.yml b/.github/workflows/node-release.yml index 2c58e475e1..065a0e7424 100644 --- a/.github/workflows/node-release.yml +++ b/.github/workflows/node-release.yml @@ -20,7 +20,7 @@ jobs: - name: Use Node.js from nvmrc uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version-file: 'platform/node/.nvmrc' - name: Check if version is published id: check @@ -115,7 +115,7 @@ jobs: - name: Use Node.js from nvmrc uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version-file: 'platform/node/.nvmrc' - name: npm ci working-directory: platform/node @@ -270,7 +270,7 @@ jobs: - name: Use Node.js from nvmrc uses: actions/setup-node@v4 with: - node-version-file: '.nvmrc' + node-version-file: 'platform/node/.nvmrc' - name: Get version id: package-version