Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add beginnings of WebAssembly build support for mono. #33551

Merged
merged 10 commits into from
Apr 10, 2020
Merged

Add beginnings of WebAssembly build support for mono. #33551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7703390
Add beginnings of WebAssembly build support for mono.
vargaz Apr 3, 2020
b803077
Add beginnings of WebAssembly build support for mono.
vargaz Apr 3, 2020
5638e2b
Merge branch 'master' into wasm-build
akoeplinger Apr 7, 2020
03bd7da
Set emcc as the compiler for libraries build
akoeplinger Apr 7, 2020
9712249
Add default subsets for webassembly build
akoeplinger Apr 7, 2020
73d2a7c
Use WebAssembly Docker image
akoeplinger Apr 7, 2020
9e130dc
Fix various problems in the build
akoeplinger Apr 7, 2020
74819de
Merge remote-tracking branch 'upstream/master' into wasm-build
akoeplinger Apr 9, 2020
1da9cc8
Bump webassembly image
akoeplinger Apr 9, 2020
a4b955f
Use Mono runtime for webassembly builds
akoeplinger Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions eng/pipelines/libraries/build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
- _addtionalBuildArguments: ''
- ${{ parameters.variables }}
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- EMSDK_PATH: $(Build.BinariesDirectory)/emsdk
- EMSDK_PATH: /usr/local/emscripten
- ${{ if eq(parameters.runTests, true) }}:
- _addtionalBuildArguments: /p:IncludeLibrariesTestSubset=true /p:ArchiveTests=true

Expand All @@ -78,15 +78,6 @@ jobs:
ln -s /usr/local/opt/openssl/lib/pkgconfig/openssl.pc /usr/local/lib/pkgconfig/
displayName: Install Build Dependencies

- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- script: |
EMSCRIPTEN_VERSION=1.38.47
git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
cd $(EMSDK_PATH)
./emsdk install ${EMSCRIPTEN_VERSION}-upstream
./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
displayName: Install Emscripten

- ${{ if eq(parameters.isOfficialBuild, true) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml
parameters:
Expand Down
12 changes: 1 addition & 11 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
value: -os Android
- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- name: EMSDK_PATH
value: $(Build.BinariesDirectory)/emsdk
value: /usr/local/emscripten
- name: archType
value: wasm
- name: osOverride
Expand All @@ -94,16 +94,6 @@ jobs:
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
displayName: Install native dependencies

- ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
- script: |
set -v
EMSCRIPTEN_VERSION=1.39.9
git clone https://github.com/emscripten-core/emsdk.git $(EMSDK_PATH)
cd $(EMSDK_PATH)
./emsdk install ${EMSCRIPTEN_VERSION}-upstream
./emsdk activate --embedded ${EMSCRIPTEN_VERSION}-upstream
displayName: Install Emscripten

# Build
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./build$(scriptExt) -subsetcategory mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci /p:MonoEnableLLVM=${{ parameters.llvm }}
Expand Down