Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into travis_user

  • Loading branch information...
commit 3705a355a9761f17b695abda1c13104b2b83de5e 2 parents a479907 + 9a7c380
@joshk joshk authored
View
15 ci_environment/couchdb/recipes/ppa.rb
@@ -20,16 +20,11 @@
# This recipe relies on a PPA package and is Ubuntu/Debian specific. Please
# keep this in mind.
-include_recipe "java"
-
-apt_repository "couchdb-ppa" do
- uri "http://ppa.launchpad.net/randall-leeds/couchdb/ubuntu"
- distribution node['lsb']['codename']
- components ["main"]
- key "59F5EA1A"
- keyserver "keyserver.ubuntu.com"
-
- action :add
+case [node[:platform], node[:platform_version]]
+when ["ubuntu", "11.10"] then
+ include_recipe "couchdb::ubuntu1110_ppa"
+when ["ubuntu", "12.04"] then
+ include_recipe "couchdb::ubuntu1204_ppa"
end
package "couchdb" do
View
39 ci_environment/couchdb/recipes/ubuntu-12.04.rb
@@ -0,0 +1,39 @@
+#
+# Cookbook Name:: couchdb
+# Recipe:: ubuntu-12.04
+#
+# Copyright 2012, Travis CI Development Team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This recipe relies on a PPA package and is Ubuntu 12.04 specific. Please
+# keep this in mind.
+
+apt_repository "couchdb-ppa" do
+ uri "http://ppa.launchpad.net/novacut/daily/ubuntu"
+ distribution node['lsb']['codename']
+ components ["main"]
+ key "BE4793F5"
+ keyserver "keyserver.ubuntu.com"
+
+ action :add
+end
+
+package "couchdb" do
+ action :install
+end
+
+service "couchdb" do
+ action [:enable, :start]
+end
View
27 ci_environment/couchdb/recipes/ubuntu1110_ppa.rb
@@ -0,0 +1,27 @@
+# Copyright 2012, Travis CI Development Team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This recipe relies on a PPA package and is Ubuntu 11.10 specific. Please
+# keep this in mind.
+
+apt_repository "couchdb-ppa" do
+ uri "http://ppa.launchpad.net/randall-leeds/couchdb/ubuntu"
+ distribution node['lsb']['codename']
+ components ["main"]
+ key "59F5EA1A"
+ keyserver "keyserver.ubuntu.com"
+
+ action :add
+end
View
27 ci_environment/couchdb/recipes/ubuntu1204_ppa.rb
@@ -0,0 +1,27 @@
+# Copyright 2012, Travis CI Development Team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This recipe relies on a PPA package and is Ubuntu 12.04 specific. Please
+# keep this in mind.
+
+apt_repository "couchdb-ppa" do
+ uri "http://ppa.launchpad.net/novacut/daily/ubuntu"
+ distribution node['lsb']['codename']
+ components ["main"]
+ key "BE4793F5"
+ keyserver "keyserver.ubuntu.com"
+
+ action :add
+end
View
10 ci_environment/haskell/recipes/default.rb
@@ -27,4 +27,12 @@
mode 0755
end
-include_recipe "haskell::source"
+case [node.platform, node.platform_version]
+when ["ubuntu", "11.10"] then
+ include_recipe "haskell::ghc_source"
+ include_recipe "haskell::platform_source"
+when ["ubuntu", "12.04"] then
+ include_recipe "haskell::ghc_package"
+ include_recipe "haskell::platform_package"
+end
+
View
28 ci_environment/haskell/recipes/ghc_package.rb
@@ -0,0 +1,28 @@
+#
+# Cookbook Name:: haskell
+# Recipe:: ghc::package
+# Copyright 2012, Travis CI development team
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+%w(ghc).each do |pkg|
+ package(pkg) do
+ action :install
+ end
+end
View
0  ci_environment/haskell/recipes/ghc.rb → ci_environment/haskell/recipes/ghc_source.rb
File renamed without changes
View
52 ci_environment/haskell/recipes/platform_package.rb
@@ -0,0 +1,52 @@
+#
+# Cookbook Name:: haskell
+# Recipe:: platform_package
+# Copyright 2012, Travis CI development team
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+script "initialize cabal" do
+ interpreter "bash"
+ user node.travis_build_environment.user
+ cwd node.travis_build_environment.home
+
+ environment Hash['HOME' => node.travis_build_environment.home]
+
+ code <<-SH
+ cabal update
+ cabal install c2hs
+ SH
+
+ # triggered by haskell-platform installation
+ action :nothing
+ # until http://haskell.1045720.n5.nabble.com/Cabal-install-fails-due-to-recent-HUnit-tt5715081.html#none is resolved :( MK.
+ ignore_failure true
+end
+
+package "haskell-platform" do
+ action :install
+
+ notifies :run, resources(:script => "initialize cabal")
+end
+
+cookbook_file "/etc/profile.d/cabal.sh" do
+ owner node.travis_build_environment.user
+ group node.travis_build_environment.group
+ mode 0755
+end
View
2  ci_environment/haskell/recipes/package.rb → ci_environment/haskell/recipes/platform_ppa.rb
@@ -1,6 +1,6 @@
#
# Cookbook Name:: haskell
-# Recipe:: ppa
+# Recipe:: platform_ppa
# Copyright 2012, Travis CI development team
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
View
9 ci_environment/haskell/recipes/platform.rb → ci_environment/haskell/recipes/platform_source.rb
@@ -1,6 +1,6 @@
#
# Cookbook Name:: haskell
-# Recipe:: platform
+# Recipe:: platform::source
# Copyright 2012, Travis CI development team
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,7 +21,12 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-include_recipe "haskell::ghc"
+case [node[:platform_name], node[:platform_version]]
+when ["ubuntu", "11.10"] then
+ include_recipe "haskell::ghc::source"
+when ["ubuntu", "12.04"] then
+ include_recipe "haskell::ghc::package"
+end
require "tmpdir"
View
4 ci_environment/haskell/recipes/source.rb
@@ -21,5 +21,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
-include_recipe "haskell::ghc"
-include_recipe "haskell::platform"
+include_recipe "haskell::ghc_source"
+include_recipe "haskell::platform_source"
View
6 ci_environment/nodejs/attributes/multi.rb
@@ -1,3 +1,3 @@
-default[:nodejs][:versions] = ["0.6.19"]
-default[:nodejs][:aliases] = { "0.6.19" => "0.6" }
-default[:nodejs][:default] = "0.6.19"
+default[:nodejs][:versions] = ["0.6.21"]
+default[:nodejs][:aliases] = { "0.6.21" => "0.6" }
+default[:nodejs][:default] = "0.6.21"
View
5 ci_environment/perlbrew/recipes/multi.rb
@@ -32,5 +32,10 @@
code "#{brew} use #{pl[:name]} && cpanm #{mod} --force --notest --mirror 'http://cpan.mirrors.travis-ci.org'"
end
end
+
+ bash "cleaning cpanm metadata for #{pl[:version]}" do
+ setup.call(self)
+ code "rm -rf ~/.cpanm"
+ end
end
View
1  ci_environment/ramfs/recipes/default.rb
@@ -24,3 +24,4 @@
end
end
+1
View
9 ci_environment/travis_build_environment/recipes/non_privileged_user.rb
@@ -49,6 +49,15 @@
end
+template "#{node.travis_build_environment.home}/.travis_ci_environment.yml" do
+ owner node.travis_build_environment.user
+ group node.travis_build_environment.group
+ mode 0755
+
+ source "vagrant/ci_environment_metadata.yml.erb"
+end
+
+
directory "#{node.travis_build_environment.home}/.ssh" do
owner node.travis_build_environment.user
group node.travis_build_environment.group
View
2  ci_environment/travis_build_environment/templates/default/vagrant/ci_environment_metadata.yml.erb
@@ -0,0 +1,2 @@
+<%- require 'yaml' %>
+<%= {:timestamp => Time.now.to_i, :recipes => node.recipes}.to_yaml %>
Please sign in to comment.
Something went wrong with that request. Please try again.