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

Jump to bottom

Add build step for ICPC (with fixes) #3465

Merged
merged 22 commits into from
May 1, 2022
Merged

Add build step for ICPC (with fixes) #3465

merged 22 commits into from
May 1, 2022

Conversation

falbrechtskirchinger
Copy link
Contributor

Fix the remaining issues of PR #3229.

nlohmann and others added 16 commits December 29, 2021 21:29
@nlohmann
⬆️ Doctest 2.4.7
f65ade0
@nlohmann
👷 add CI step for ICPC
ab557ae
@nlohmann
👷 add CI step for ICPC
15eaae2
@nlohmann
👷 add CI step for ICPC
7b60a2a
@nlohmann
⬇️ downgrade to Doctest 2.4.6
604e449
@nlohmann
👷 add CI step for ICPC
e40843f
@nlohmann
👷 add CI step for ICPC
3822537
@nlohmann
👷 add CI step for ICPC
42acea3
@nlohmann
👷 add CI step for ICPC
0152bac
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into icpc
8cbe3ed 
� Conflicts:
�	.github/workflows/ubuntu.yml
�	cmake/ci.cmake
@nlohmann
👷 add CI step for ICPC
23a7a2d
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into icpc
3a4da7c
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into icpc
3e767c7
@nlohmann
Merge branch 'develop' of https://github.com/nlohmann/json into icpc
e1190d6
@nlohmann
🔇 suppress warning nlohmann#2196: routine is both "inline" and "noinl…
f9dfd63 
…ine"
@falbrechtskirchinger
Re-enable <filesystem> detection on ICPC
9463ccd
nlohmann
nlohmann reviewed May 1, 2022
View reviewed changes
README.md Show resolved Hide resolved
tests/src/unit-wstring.cpp Show resolved Hide resolved
tests/src/unit-regression2.cpp Show resolved Hide resolved
nlohmann
nlohmann approved these changes May 1, 2022
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this May 1, 2022
@nlohmann nlohmann added this to the Release 3.11.0 milestone May 1, 2022
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling c9f9923 on falbrechtskirchinger:icpc into 0c698b7 on nlohmann:develop.

@nlohmann nlohmann merged commit bdc21ad into nlohmann:develop May 1, 2022
@nlohmann
Copy link
Owner

nlohmann commented May 1, 2022

Thanks!

@nlohmann nlohmann mentioned this pull request May 1, 2022
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🔨 further change
Projects
None yet
Milestone
Release 3.11.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@falbrechtskirchinger @coveralls @nlohmann