Skip to content

Commit

Permalink
Fix missing export of malloc for newer versions of Emscripten.
Browse files Browse the repository at this point in the history
Disable MSAN and TSAN.

Update actions/checkout to v4.
  • Loading branch information
rmacnak committed Mar 17, 2024
1 parent 109074b commit 94f5a81
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 36 deletions.
42 changes: 7 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -22,7 +22,7 @@ jobs:
linux-asan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -33,38 +33,10 @@ jobs:
run: ./out/ReleaseASanX64/primordialsoup out/snapshots/TestRunner.vfuel
env:
ASAN_OPTIONS: halt_on_error=1
linux-msan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install clang scons
- name: Build
run: ./build arch=x64 sanitize=memory cxx_host=clang++
- name: Test
run: ./out/ReleaseMSanX64/primordialsoup out/snapshots/TestRunner.vfuel
env:
MSAN_OPTIONS: halt_on_error=1
linux-tsan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install g++ scons
- name: Build
run: ./build arch=x64 sanitize=thread
- name: Test
run: ./out/ReleaseTSanX64/primordialsoup out/snapshots/TestRunner.vfuel
env:
TSAN_OPTIONS: halt_on_error=1
linux-ubsan:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -78,7 +50,7 @@ jobs:
macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: HOMEBREW_NO_AUTO_UPDATE=1 brew install scons
- name: Build
Expand All @@ -88,7 +60,7 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: pip install scons
- name: Build
Expand All @@ -100,7 +72,7 @@ jobs:
android:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand All @@ -110,7 +82,7 @@ jobs:
web:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Dependencies
run: |
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def BuildVM(cxx, arch, target_os, debug, sanitize):
env['LINKFLAGS'] += [
'-s', 'ALLOW_MEMORY_GROWTH=1',
'-s', 'ENVIRONMENT=web',
'-s', 'EXPORTED_FUNCTIONS=["_load_snapshot", "_handle_message", "_handle_signal", "_free"]',
'-s', 'EXPORTED_FUNCTIONS=["_load_snapshot", "_handle_message", "_handle_signal", "_malloc", "_free"]',
'-s', 'FILESYSTEM=0',
'-s', 'MALLOC=emmalloc',
'-s', 'TOTAL_STACK=131072',
Expand Down

0 comments on commit 94f5a81

Please sign in to comment.