summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Barton <barton.tomas@gmail.com>2013-10-13 18:35:30 +0200
committerTomas Barton <barton.tomas@gmail.com>2013-10-13 18:35:30 +0200
commitee44760c3633c35eba23261e5ed5594b512f0d65 (patch)
tree584a96ab49087874d83c3ad43df37eeb4fb9cf84
parentb4453fb9b9619cf930d26d58d77ef3229ff16313 (diff)
removed fixtures file, librarian is much better
-rw-r--r--.fixtures.yml8
-rw-r--r--.travis.yml2
-rwxr-xr-xscript/bootstrap3
-rwxr-xr-xscript/cibuild9
4 files changed, 1 insertions, 21 deletions
diff --git a/.fixtures.yml b/.fixtures.yml
deleted file mode 100644
index 42dee4e..0000000
--- a/.fixtures.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-fixtures:
- repositories:
- concat: "https://github.com/puppetlabs/puppetlabs-concat"
- stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib"
-
- symlinks:
- munin: "#{source_dir}"
-
diff --git a/.travis.yml b/.travis.yml
index 41039c1..330677c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ rvm:
- 1.8.7
- 1.9.3
- 2.0.0
-script: './script/cibuild'
+script: 'rake spec'
env:
- PUPPET_VERSION=2.6.0
- PUPPET_VERSION=2.7.0
diff --git a/script/bootstrap b/script/bootstrap
deleted file mode 100755
index 0695797..0000000
--- a/script/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-bundle install --path vendor/gems --local
diff --git a/script/cibuild b/script/cibuild
deleted file mode 100755
index d1c8c06..0000000
--- a/script/cibuild
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-
-[ -z "${PUPPET_VERSION}" ] && script/bootstrap
-
-bundle exec rspec
-
-bundle exec puppet-lint --with-filename --fail-on-warnings manifests