Codechange: vendor the nlohmann-json library (#11290)
This commit is contained in:
7
.github/workflows/ci-build.yml
vendored
7
.github/workflows/ci-build.yml
vendored
@@ -32,11 +32,10 @@ jobs:
|
||||
path: /emsdk/upstream/emscripten/cache
|
||||
key: 3.1.42-${{ runner.os }}
|
||||
|
||||
- name: Patch Emscripten to support LZMA and nlohmann-json
|
||||
- name: Patch Emscripten to support LZMA
|
||||
run: |
|
||||
cd /emsdk/upstream/emscripten
|
||||
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
|
||||
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
|
||||
|
||||
- name: Build (host tools)
|
||||
run: |
|
||||
@@ -118,7 +117,6 @@ jobs:
|
||||
libicu-dev \
|
||||
liblzma-dev \
|
||||
liblzo2-dev \
|
||||
nlohmann-json3-dev \
|
||||
${{ matrix.libraries }} \
|
||||
zlib1g-dev \
|
||||
# EOF
|
||||
@@ -215,7 +213,6 @@ jobs:
|
||||
liblzma \
|
||||
libpng \
|
||||
lzo \
|
||||
nlohmann-json \
|
||||
zlib \
|
||||
# EOF
|
||||
|
||||
@@ -300,7 +297,6 @@ jobs:
|
||||
liblzma \
|
||||
libpng \
|
||||
lzo \
|
||||
nlohmann-json \
|
||||
zlib \
|
||||
# EOF
|
||||
|
||||
@@ -387,7 +383,6 @@ jobs:
|
||||
mingw-w64-${{ matrix.arch }}-libpng
|
||||
mingw-w64-${{ matrix.arch }}-lld
|
||||
mingw-w64-${{ matrix.arch }}-ninja
|
||||
mingw-w64-${{ matrix.arch }}-nlohmann-json
|
||||
|
||||
- name: Install OpenGFX
|
||||
shell: bash
|
||||
|
||||
3
.github/workflows/preview-build.yml
vendored
3
.github/workflows/preview-build.yml
vendored
@@ -40,11 +40,10 @@ jobs:
|
||||
path: /emsdk/upstream/emscripten/cache
|
||||
key: 3.1.42-${{ runner.os }}
|
||||
|
||||
- name: Patch Emscripten to support LZMA and nlohmann_json
|
||||
- name: Patch Emscripten to support LZMA
|
||||
run: |
|
||||
cd /emsdk/upstream/emscripten
|
||||
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-liblzma.patch
|
||||
patch -p1 < ${GITHUB_WORKSPACE}/os/emscripten/emsdk-nlohmann-json.patch
|
||||
|
||||
- name: Build (host tools)
|
||||
run: |
|
||||
|
||||
1
.github/workflows/release-linux.yml
vendored
1
.github/workflows/release-linux.yml
vendored
@@ -130,7 +130,6 @@ jobs:
|
||||
liblzma \
|
||||
libpng \
|
||||
lzo \
|
||||
nlohmann-json \
|
||||
sdl2 \
|
||||
zlib \
|
||||
# EOF
|
||||
|
||||
2
.github/workflows/release-macos.yml
vendored
2
.github/workflows/release-macos.yml
vendored
@@ -75,8 +75,6 @@ jobs:
|
||||
libpng:arm64-osx \
|
||||
lzo:x64-osx \
|
||||
lzo:arm64-osx \
|
||||
nlohmann-json:x64-osx \
|
||||
nlohmann-json:arm64-osx \
|
||||
zlib:x64-osx \
|
||||
zlib:arm64-osx \
|
||||
# EOF
|
||||
|
||||
1
.github/workflows/release-windows.yml
vendored
1
.github/workflows/release-windows.yml
vendored
@@ -80,7 +80,6 @@ jobs:
|
||||
liblzma \
|
||||
libpng \
|
||||
lzo \
|
||||
nlohmann-json \
|
||||
zlib \
|
||||
# EOF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user