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

revive #254 and fix #268 #274

Merged
merged 1 commit into from
Apr 2, 2018
Merged

revive #254 and fix #268 #274

merged 1 commit into from
Apr 2, 2018

Conversation

shengc
Copy link
Contributor

@shengc shengc commented Apr 2, 2018

No description provided.

@shengc shengc mentioned this pull request Apr 2, 2018
Closed
@rockjam
Copy link
Collaborator

rockjam commented Apr 2, 2018

@shengc I think that diff is much bigger than intended, right? There are a lot of commits from other people in this PR

@shengc
Copy link
Contributor Author

shengc commented Apr 2, 2018

@rockjam I don't know how this can be properly handled. I just reverted the following and applied fix on top of it...

commit 9b13e2b
Author: Li Haoyi haoyi.sg@gmail.com
Date: Sun Apr 1 23:01:42 2018 -0700

revert #254 to fix bootstrapping https://github.com/lihaoyi/mill/issues/268

@rockjam
Copy link
Collaborator

rockjam commented Apr 2, 2018

@shengc you could try to cherry-pick required commit, or make a format-patch from it and apply to current master branch

@shengc
Copy link
Contributor Author

shengc commented Apr 2, 2018

@rockjam I have rebased the commits.

@rockjam
Copy link
Collaborator

rockjam commented Apr 2, 2018

Thank you. Can you point what is the fix exactly?

@shengc
Copy link
Contributor Author

shengc commented Apr 2, 2018

the conf part for <dependency /> of generated ivy.xml was wrong. I just need to use scopeToConf function to convert Scope to its properly corresponding configuration.

@shengc
Copy link
Contributor Author

shengc commented Apr 2, 2018

@robby-phd @rockjam @lihaoyi the fix has passed the bootstrap test test-mill-release.sh

@rockjam
Copy link
Collaborator

rockjam commented Apr 2, 2018

Looks good to me

@rockjam rockjam merged commit 8cdc9f1 into com-lihaoyi:master Apr 2, 2018
@Ammonite-Bot Ammonite-Bot mentioned this pull request Apr 7, 2018
Merged
robby-phd added a commit that referenced this pull request Apr 7, 2018
@robby-phd
Merge April 1 - 4, 2018 changes on master (#283)
ccb67db 
* fix build

* Detect sh/batch launcher, dev.assembly, and release filename.

* Updated appveyor cache.

* Added some entries for master in readme.md changelog.

* Updated readme.md changelog.

* fixes #173; use default(compile) configuration for deps as default (#270)

* revert #254 to fix bootstrapping #268

* Updated ci tests.

* Reverted Ammonite caching workaround (a796f0a) now that it's fixed

* Changed ci/test-mill-0.sh to use interactive mode due to intermittent client failures to connect to server in travis

* Added ci/test-mill-bootstrap.sh (ci/test-mill-0.sh with bootstrapping) and use it on oraclejdk9 instead of ci/test-mill-0.sh

* Upgraded mill used for ci to 0.1.7-29-f5097f

* revive #254 and fix #268 (#274)

* Test mill batch (.bat) in AppVeyor

* fix minor typos in docs

* Sync Ammonite in ScalaModule (with build.sc).
@lefou lefou added this to the 0.2.0 milestone May 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.2.0
Development

Successfully merging this pull request may close these issues.
4 participants
@shengc @rockjam @lefou @leakyabstraction