8000 Merge pull request #50 from scala-wasm/sync-upstream · scala-wasm/scala-wasm@a99154a · GitHub
[go: up one dir, main page]
Skip to content

Commit a99154a

Browse files
tanishikingtanishiking
authored
Merge pull request #50 from scala-wasm/sync-upstream
Sync upstream
2 parents aa23cb0 + 1baf16b commit a99154a

File tree

42 files changed

+1731
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1731
-243
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- scala-wasm
1212

1313
env:
14-
SBT_OPTS: "-Xmx4G"
14+
SBT_OPTS: '-Xmx6g -Xms1g -Xss4m'
1515

1616
jobs:
1717
test-suite-js:

‎.github/workflows/windows-ci.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Windows CI
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
9+
env:
10+
SBT_OPTS: '-Xmx6g -Xms1g -Xss4m'
11+
12+
jobs:
13+
build:
14+
strategy:
15+
matrix:
16+
java: [ '8' ]
17+
18+
# Use the latest supported version. We will be less affected by ambient changes
19+
# due to the lack of pinning than by breakages because of changing version support.
20+
runs-on: windows-latest
21+
22+
steps:
23+
- name: Set up git to use LF
24+
run: |
25+
git config --global core.autocrlf false
26+
git config --global core.eol lf
27+
- uses: actions/checkout@v3
28+
- name: Set up JDK ${{ matrix.java }}
29+
uses: coursier/setup-action@v1
30+
with:
31+
jvm: temurin:1.${{ matrix.java }}
32+
apps: sbt
33+
- uses: actions/setup-node@v4
34+
with:
35+
node-version: '24.x'
36+
cache: 'npm'
37+
- name: npm install
38+
run: npm install
39+
40+
# Very far from testing everything, but at least it is a good sanity check
41+
- name: Test suite
42+
run: sbt testSuite2_12/test
43+
- name: Linker test suite
44+
run: sbt linker2_12/test
45+
# partest is slow; only execute one test as a smoke test
46+
- name: partest smoke test
47+
run: sbt "partestSuite2_12/testOnly -- --fastOpt run/option-fold.scala"
48+
# Module splitting has some logic for case-insensitive filesystems, which we must test on Windows
49+
- name: Test suite with module splitting
50+
run: sbt 'set testSuite.v2_12/scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.ESModule).withModuleSplitStyle(ModuleSplitStyle.SmallModulesFor(List("org.scalajs.testsuite"))))' testSuite2_12/test
51+
shell: bash # for the special characters in the command

‎appveyor.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0