Skip to content

Commit 5f59590

Browse files
committed
Try installing rapydscript on windows CI as well
1 parent 96429b0 commit 5f59590

4 files changed

Lines changed: 20 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ jobs:
2222
with:
2323
python-version: "3.14"
2424

25+
- name: Setup node.js for rapydscript
26+
uses: actions/setup-node@v6
27+
with:
28+
node-version: "latest"
29+
2530
- name: Install calibre dependencies
2631
run:
2732
python setup/unix-ci.py install

.github/workflows/codeql.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151
languages: ${{ matrix.language }}
5252
trap-caching: false
5353

54+
- name: Setup node.js for rapydscript
55+
uses: actions/setup-node@v6
56+
with:
57+
node-version: "latest"
58+
5459
- name: Install calibre dependencies
5560
if: matrix.language == 'c'
5661
run:

setup/unix-ci.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,21 @@ def check_dependencies() -> None:
237237

238238
def main():
239239
action = sys.argv[1]
240-
if iswindows:
241-
import runpy
242-
m = runpy.run_path('setup/win-ci.py')
243-
return m['main']()
240+
244241
if action == 'install':
245242
# WebEngine is flaky in macOS CI so install rapydscript so bootstrap wont fail
246-
run('npm', 'install', 'rapydscript-ng')
243+
npm = 'npm.cmd' if iswindows else 'npm'
244+
run(npm, 'install', 'rapydscript-ng')
247245
root = subprocess.check_output(['npm', 'root']).decode().strip()
248246
with open(os.environ['GITHUB_PATH'], 'a') as f:
249247
print(os.path.abspath(os.path.join(root, '.bin')), file=f)
250248

249+
if iswindows:
250+
import runpy
251+
m = runpy.run_path('setup/win-ci.py')
252+
return m['main']()
253+
254+
if action == 'install':
251255
install_bundle()
252256
if not ismacos:
253257
install_linux_deps()

setup/win-ci.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ def main():
9191
q = sys.argv[-1]
9292
setup_env()
9393
if q == 'bootstrap':
94+
subprocess.check_call(['rapydscript', '--version'])
9495
build()
9596
elif q == 'test':
9697
test()

0 commit comments

Comments
 (0)