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

Add Json Support #894

Merged
merged 12 commits into from
Jul 17, 2020
Merged

Add Json Support #894

merged 12 commits into from
Jul 17, 2020

Conversation

waruqi
Copy link
Member

@waruqi waruqi commented Jul 16, 2020

  • Before adding new features and new modules, please go to issues to submit the relevant feature description first.
  • Write good commit messages and use the same coding conventions as the rest of the project.
  • Please commit code to dev branch and we will merge into master branch in feature
  • Ensure your edited codes with four spaces instead of TAB.

  • 增加新特性和新模块之前,请先到issues提交相关特性说明,经过讨论评估确认后,再进行相应的代码提交,避免做无用工作。
  • 编写友好可读的提交信息,并使用与工程代码相同的代码规范,代码请用4个空格字符代替tab缩进。
  • 请提交代码到dev分支,如果通过,我们会在特定时间合并到master分支上。
  • 为了规范化提交日志的格式,commit消息,不要用中文,请用英文描述。

@waruqi waruqi changed the base branch from master to dev July 16, 2020 02:08
@waruqi waruqi mentioned this pull request Jul 16, 2020
@waruqi waruqi marked this pull request as ready for review July 16, 2020 14:50
@waruqi
Copy link
Member Author

waruqi commented Jul 17, 2020

@OpportunityLiu 为啥有时候 ci上git会拉不到对应的pr/commit? 你知道咋回事不?

https://github.com/xmake-io/xmake/actions/runs/172137962

  /usr/bin/git checkout 671d7c1732026eac66bd3d8dbc770b094fdab74d
  fatal: reference is not a tree: 671d7c1732026eac66bd3d8dbc770b094fdab74d
##[error]The process '/usr/bin/git' failed with exit code 128

@OpportunityLiu
Copy link
Member

图片

所以这个 671d7c1 是啥玩意

@OpportunityLiu
Copy link
Member

actions/checkout@v1 签出的那个分支刚好是反的
图片

@OpportunityLiu
Copy link
Member

完了加个使用本地的xmake repo吧

@waruqi
Copy link
Member Author

waruqi commented Jul 17, 2020

actions/checkout@v1 签出的那个分支刚好是反的
图片

搞不懂,我就是开了分支建了个pr,怎么会存在反过来的?

@waruqi
Copy link
Member Author

waruqi commented Jul 17, 2020

完了加个使用本地的xmake repo吧

使用本地?怎么搞?

@waruqi waruqi merged commit f9a4493 into dev Jul 17, 2020
@waruqi waruqi deleted the json branch July 17, 2020 08:04
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