Skip to content

Commit

Permalink
Merge pull request #17 from scalacenter/readme
Browse files Browse the repository at this point in the history
Prepare for 0.1
  • Loading branch information
olafurpg authored Oct 24, 2016
2 parents 7e423ff + e70f42b commit fdc0fed
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 63 deletions.
13 changes: 6 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# Trigger build 8
build:
image: olafurpg/scalafix:0.0.1
environment:
- COURSIER_CACHE=/drone/cache/coursier
commands:
- apt-get install nailgun
- alias ng=ng-nailgun
- export PATH=$PATH:/root/local/bin
- pip install --user codecov
- ./bin/setupCI.sh
- ./bin/testAll.sh
# I can't be bothered to hide this token.
- $HOME/.local/bin/codecov -t 5f2117aa-0a01-4cf1-8bf7-631a62ccb47a

cache:
mount:
- /drone/cache
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: scala
# Use container-based infrastructure
sudo: false
# These directories are cached to S3 at the end of the build
cache:
directories:
- $HOME/.ivy2/cache
Expand All @@ -11,13 +9,12 @@ git:
scala:
- 2.11.8
before_install:
- pip install --user codecov
- ./bin/setupCI.sh
script:
- ./bin/testAll.sh
after_success:
- codecov
jdk:
- oraclejdk8
- oraclejdk7
notifications:
email:
Expand Down
41 changes: 0 additions & 41 deletions bin/nailgun_integration_test.sh

This file was deleted.

5 changes: 5 additions & 0 deletions bin/setupCI.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env bash
set -e
apt-get install nailgun
alias ng=ng-nailgun
pip install --user codecov
10 changes: 3 additions & 7 deletions bin/testAll.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash
set -e

sbt clean coverage test
sbt "; publishLocal ; scripted ; cli/pack"
sbt coverageAggregate

# Integration tests
./bin/nailgun_integration_test.sh

sbt -Dsbt.home.ivy=/drone/cache/ivy2 clean coverage test
sbt -Dsbt.home.ivy=/drone/cache/ivy2 "; publishLocal ; scripted ; cli/pack"
sbt -Dsbt.home.ivy=/drone/cache/ivy2 coverageAggregate
3 changes: 1 addition & 2 deletions cli/src/main/scala/scalafix/cli/Cli.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ case class ScalafixOptions(
) debug: Boolean = false,
@Recurse common: CommonOptions = CommonOptions()
) extends App {

Cli.runOn(this)
Cli.runOn(this.copy(files = files ++ remainingArgs))
}

object Cli extends AppOf[ScalafixOptions] {
Expand Down
3 changes: 1 addition & 2 deletions readme/Intro.scalatex
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@

@p
@raw
<a href="https://codecov.io/github/scalacenter/scalafix?branch=master"><img src="https://camo.githubusercontent.com/75d300982e3330c6b8eaaba63adad94fecd71287/68747470733a2f2f636f6465636f762e696f2f6769746875622f6f6c6166757270672f7363616c61666d742f636f7665726167652e7376673f6272616e63683d6d6173746572" alt="codecov.io" data-canonical-src="https://codecov.io/github/scalacenter/scalafix/coverage.svg?branch=master" style="max-width:100%;"></a>
<a href="https://travis-ci.org/scalacenter/scalafix"><img src="https://camo.githubusercontent.com/6b6e23e24c648ccd29152db1fbee32bf88eccb46/68747470733a2f2f7472617669732d63692e6f72672f6f6c6166757270672f7363616c61666d742e7376673f6272616e63683d6d6173746572" alt="Build Status" data-canonical-src="https://travis-ci.org/scalacenter/scalafix.svg?branch=master" style="max-width:100%;"></a>
<a href="http://stats.lassie.io:8001/scalacenter/scalafix"><img src="http://stats.lassie.io:8001/api/badges/scalacenter/scalafix/status.svg" /></a>
<a href="https://gitter.im/scalacenter/scalafix?utm_source=badge&amp;utm_medium=badge&amp;utm_campaign=pr-badge&amp;utm_content=badge"><img src="https://camo.githubusercontent.com/382ebf95f5b4df9275ac203229928db8c8fd5c50/68747470733a2f2f6261646765732e6769747465722e696d2f6f6c6166757270672f7363616c61666d742e737667" alt="Join the chat at https://gitter.im/scalacenter/scalafix" data-canonical-src="https://badges.gitter.im/scalacenter/scalafix.svg" style="max-width:100%;"></a>

@p
Expand Down

0 comments on commit fdc0fed

Please sign in to comment.