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

Make library work with Clang on Windows #2259

Merged
merged 29 commits into from
Jul 12, 2020
Merged

Make library work with Clang on Windows #2259

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2182935
:construction_worker: add Clang/Windows step
nlohmann May 30, 2020
42ef2a5
:construction_worker: use Clang compiler
nlohmann May 30, 2020
9191926
:construction_worker: use Makefiles
nlohmann May 30, 2020
0309025
:construction_worker: set full path
nlohmann May 30, 2020
fbd3e8f
:construction_worker: install clang
nlohmann May 30, 2020
4ba8c95
:construction_worker: install clang
nlohmann May 30, 2020
9c971c2
:construction_worker: install clang
nlohmann May 30, 2020
7e5c2a4
:construction_worker: install clang
nlohmann May 30, 2020
522ec5d
:construction_worker: install clang
nlohmann May 30, 2020
7c0c522
:construction_worker: install clang
nlohmann May 30, 2020
5f10d5d
:construction_worker: install clang
nlohmann May 30, 2020
5ea205f
:construction_worker: install clang
nlohmann May 30, 2020
4f04ea1
Merge branches 'clang_windows' and 'develop' of https://github.com/nl…
nlohmann Jun 3, 2020
0498202
:art: replace alternative operators (and, not, or)
nlohmann Jun 3, 2020
65c4b07
:art: replace alternative operators (and, not, or)
nlohmann Jun 3, 2020
402c34c
:construction_worker: try Clang 10
nlohmann Jun 4, 2020
dc32331
:construction_worker: try Clang 10
nlohmann Jun 4, 2020
a53e3a5
:construction_worker: try Clang 8
nlohmann Jun 4, 2020
24e8562
:construction_worker: remove Clang 8
nlohmann Jun 4, 2020
ac3922c
Merge branch 'develop' of https://github.com/nlohmann/json into clang…
nlohmann Jun 27, 2020
d7a2956
:twisted_rightwards_arrows: merge from develop
nlohmann Jun 27, 2020
609a004
:recycle: replace further alternative operators
nlohmann Jul 11, 2020
b2240f7
:checkered_flag: remove failing code for Clang/Windows
nlohmann Jul 11, 2020
889f269
:recycle: replace further alternative operators
nlohmann Jul 11, 2020
dc06f10
Merge branch 'develop' of https://github.com/nlohmann/json into clang…
nlohmann Jul 11, 2020
7f92342
:twisted_rightwards_arrows: merge develop branch and resolve conflicts
nlohmann Jul 11, 2020
6477b9b
:recycle: replace further alternative operators
nlohmann Jul 11, 2020
8d29523
:fire: remove unused boolean_operators.hpp header
nlohmann Jul 11, 2020
4d28694
:recycle: replace further alternative operators
nlohmann Jul 11, 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
Prev Previous commit
Next Next commit
👷 install clang
  • Loading branch information
@nlohmann
nlohmann committed May 30, 2020
commit 5ea205f570a25edb2f425e84cc9121e4c02cea5a
9 changes: 2 additions & 7 deletions .github/workflows/windows_clang.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: install Clang
run: mkdir clang ; curl -fsSL -o LLVM9.exe https://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe ; 7z x LLVM9.exe -y -oclang
- name: find directory
run: cd ; cd clang ; cd
run: curl -fsSL -o LLVM9.exe https://releases.llvm.org/9.0.0/LLVM-9.0.0-win64.exe ; 7z x LLVM9.exe -y -o"C:/Program Files/LLVM"
- name: cmake
run: cmake -S . -B build -DCMAKE_CXX_COMPILER="D:/a/json/json/clang/bin/clang++.exe" -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
run: cmake -S . -B build -DCMAKE_CXX_COMPILER="C:/Program Files/LLVM/bin/clang++.exe" -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On
- name: build
run: cmake --build build --parallel 10
- name: test
run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure
- uses: actions/upload-artifact@v2
with:
path: C:\ProgramData\chocolatey\logs\chocolatey.log