Merge April 1 - 4, 2018 changes on master #283
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
# Conflicts: # .travis.yml # scalalib/src/mill/scalalib/Dep.scala
|
LGTM, removal was just my screwing up with git
…On Sat, 7 Apr 2018 at 5:15 AM, Robby ***@***.***> wrote:
Branch master was recently force pushed and it removed some changes made
on April 1-6.
If the removal is unintentional, this PR restores/merges those changes
with current master.
------------------------------
You can view, comment on, or merge this pull request online at:
#283
Commit Summary
- 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. [skip ci]
- fixes #173; use default(compile) configuration for deps as default
(#270)
- revert #254 to fix bootstrapping
#268
- Updated ci tests.
- revive #254 and fix #268 (#274)
- Test mill batch (.bat) in AppVeyor
- Merge branch 'master' into restore-master
- Restored to use ci/test-mill-bootstrap.sh instead of
ci/test-mill-0.sh on oraclejdk9.
- Sync Ammonite in ScalaModule (with build.sc).
File Changes
- *M* .appveyor.yml
<https://github.com/lihaoyi/mill/pull/283/files#diff-0> (18)
- *M* .travis.yml
<https://github.com/lihaoyi/mill/pull/283/files#diff-1> (4)
- *M* build.sc <https://github.com/lihaoyi/mill/pull/283/files#diff-2>
(33)
- *M* ci/test-mill-0.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-3> (4)
- *M* ci/test-mill-1.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-4> (2)
- *M* ci/test-mill-2.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-5> (2)
- *A* ci/test-mill-bootstrap.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-6> (26)
- *M* ci/test-mill-dev.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-7> (4)
- *M* ci/test-mill-release.sh
<https://github.com/lihaoyi/mill/pull/283/files#diff-8> (7)
- *M* main/src/mill/modules/Jvm.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-9> (6)
- *M* readme.md
<https://github.com/lihaoyi/mill/pull/283/files#diff-10> (35)
- *M* scalalib/src/mill/scalalib/Dep.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-11> (10)
- *M* scalalib/src/mill/scalalib/ScalaModule.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-12> (2)
- *M* scalalib/src/mill/scalalib/publish/Ivy.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-13> (6)
- *M* scalalib/src/mill/scalalib/publish/Pom.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-14> (2)
- *M* scalalib/test/src/mill/scalalib/ResolveDepsTests.scala
<https://github.com/lihaoyi/mill/pull/283/files#diff-15> (8)
Patch Links:
- https://github.com/lihaoyi/mill/pull/283.patch
- https://github.com/lihaoyi/mill/pull/283.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#283>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/ATpwjG8dd3lThyiZUujfAHaJo_1Abf_mks5tmK3SgaJpZM4TLDsd>
.
|
|
turned on master branch protection to avoid further screwups |
robby-phd
changed the title
|
No problem. Glad that I still have some of the git history locally. |
robby-phd
changed the title
robby-phd
added a commit
that referenced
this pull request
Apr 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
masterwas recently force pushed and it removed some changes made on April 1-4.If the removal was unintentional, this PR restores/merges those changes with current
master.