Skip to content

Commit d4af98b

Browse files
committed
fix(build): fix rollup failing
Use actions/setup-node instead of MSYS2. Revert commit `fix(build): using @rollup/wasm-node` partial changes in #3905 Signed-off-by: Coia Prant <coiaprant@gmail.com>
1 parent 5bd3a2b commit d4af98b

4 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
uses: msys2/setup-msys2@4f806de0a5a7294ffabaff804b38a9b435a73bda # v2.30.0
4646
with:
4747
msystem: ${{ matrix.msystem }}
48+
path-type: inherit
4849
update: true
4950
install: >-
5051
wget
@@ -71,7 +72,6 @@ jobs:
7172
"mingw-w64-${TOOLCHAIN}-graphviz"
7273
"mingw-w64-${TOOLCHAIN}-miniupnpc"
7374
"mingw-w64-${TOOLCHAIN}-nlohmann-json"
74-
"mingw-w64-${TOOLCHAIN}-nodejs"
7575
"mingw-w64-${TOOLCHAIN}-onevpl"
7676
"mingw-w64-${TOOLCHAIN}-openssl"
7777
"mingw-w64-${TOOLCHAIN}-opus"
@@ -141,6 +141,11 @@ jobs:
141141
# Clean up
142142
Remove-Item -Path doxygen-setup.exe
143143
144+
- name: Setup nodejs
145+
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
146+
with:
147+
node-version: 'lts/*'
148+
144149
- name: Setup dotnet # needed for wix
145150
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
146151
with:

docs/building.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ dependencies=(
161161
"mingw-w64-${TOOLCHAIN}-doxygen" # Optional, for docs... better to install official Doxygen
162162
"mingw-w64-${TOOLCHAIN}-graphviz" # Optional, for docs
163163
"mingw-w64-${TOOLCHAIN}-miniupnpc"
164-
"mingw-w64-${TOOLCHAIN}-nodejs"
165164
"mingw-w64-${TOOLCHAIN}-onevpl"
166165
"mingw-w64-${TOOLCHAIN}-openssl"
167166
"mingw-w64-${TOOLCHAIN}-opus"
@@ -178,6 +177,8 @@ pacman -S "${dependencies[@]}"
178177

179178
To create a WiX installer, you also need to install [.NET](https://dotnet.microsoft.com/download).
180179

180+
To build frontend, you also need to install [Node.JS](https://nodejs.org/en/download)
181+
181182
### Clone
182183
Ensure [git](https://git-scm.com) is installed on your system, then clone the repository using the following command:
183184

package.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
"@vitejs/plugin-vue": "6.0.1",
2323
"serve": "14.2.5",
2424
"vite": "6.3.6",
25-
"vite-plugin-ejs": "1.7.0",
26-
"@rollup/wasm-node": "4.57.1"
27-
},
28-
"overrides": {
29-
"rollup": "npm:@rollup/wasm-node@4.57.1"
25+
"vite-plugin-ejs": "1.7.0"
3026
}
3127
}

scripts/linux_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ elif grep -q "Debian GNU/Linux 12 (bookworm)" /etc/os-release; then
695695
cuda_version="12.9.1"
696696
cuda_build="575.57.08"
697697
gcc_version="13"
698-
nvm_node=1
698+
nvm_node=0
699699
elif grep -q "Debian GNU/Linux 13 (trixie)" /etc/os-release; then
700700
distro="debian"
701701
version="13"
@@ -704,7 +704,7 @@ elif grep -q "Debian GNU/Linux 13 (trixie)" /etc/os-release; then
704704
cuda_version="12.9.1"
705705
cuda_build="575.57.08"
706706
gcc_version="14"
707-
nvm_node=1
707+
nvm_node=0
708708
elif grep -q "PLATFORM_ID=\"platform:f41\"" /etc/os-release; then
709709
distro="fedora"
710710
version="41"

0 commit comments

Comments
 (0)