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.

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

Change toml lib + fix macro bug on devel #173

Merged
merged 4 commits into from
Feb 9, 2023

Conversation

HugoGranstrom
Copy link
Collaborator

  • Fixes the orc bug on Adding devel to CI, fix #161, fix #149 #169
  • Changes the toml parsing library to parsetoml which should make nimib run on orc finally. I had to do some workarounds though, like making my own customToJson proc to get the correct JSON for std / json to be able to parse it correctly into a NbConfig.

@pietroppeter
Copy link
Owner

pietroppeter commented Feb 9, 2023

Looks great, thanks! And loadTomlSection will be used by nimibook (see https://github.com/pietroppeter/nimibook/blob/main/src/nimibook/configs.nim, I will make the changes).

It is all here right? Does this work with devel now? We can merge this and then rebase the CI Pr on the new master, correct?

@HugoGranstrom
Copy link
Collaborator Author

I found one bug that the stdlib doesn't like missing fields, so I opted for using jsony instead for the deserialization. But now it should be ready to go if the CI is green. I have tried it locally with devel and the configuration is loaded without any error. So we can merge this and see if the CI PR works with it :)

@pietroppeter
Copy link
Owner

good yeah, I imagined jsony would be a better fit being a loose parser. looks good, merging and rebasing CI since I am curious to see it green (then I will also add a changelog for this)

@pietroppeter pietroppeter merged commit 4ce9057 into pietroppeter:main Feb 9, 2023
pietroppeter added a commit that referenced this pull request Feb 9, 2023
* fix orc macro bug

* replace toml_serialization with parsetoml

* clean up

* use jsony for deserialzation as it can handle missing fields

Co-authored-by: Hugo Granström <5092565+HugoGranstrom@users.noreply.github.com>
pietroppeter added a commit that referenced this pull request Feb 9, 2023
* Adding devel to CI

I am adding both stable (that will become 2.x soon) and devel (which is candidate for 2.x). Also update versions of cache and setup-nim-action

* disable fail-fast for test CI

see https://stackoverflow.com/a/65647509/4178189

* Change toml lib + fix macro bug on devel (#173) (#174)

* fix orc macro bug

* replace toml_serialization with parsetoml

* clean up

* use jsony for deserialization as it can handle missing fields

Co-authored-by: Hugo Granström <5092565+HugoGranstrom@users.noreply.github.com>

* bump to 0.3.6

---------

Co-authored-by: Hugo Granström <5092565+HugoGranstrom@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants