Permalink
Browse files

move cabal update to .travis

  • Loading branch information...
1 parent a61c041 commit 670e210e09ce97a053db3de438dae95dcff8fd25 @mwotton committed Jan 11, 2013
Showing with 2 additions and 1 deletion.
  1. +1 −0 .travis.yml
  2. +1 −1 Rakefile
View
@@ -5,6 +5,7 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq ghc ghc-dynamic cabal-install zlib1g-dev
before_script:
+ - cabal update
- bundle exec rake
script:
- PATH=$HOME/.cabal/bin:$PATH bundle exec rspec spec/hubris_spec.rb
View
@@ -34,7 +34,7 @@ extraIncludeDirs = [\"#{headers}\", \"#{arch_headers}\"]"
# command="cd Haskell; cabal update; cabal install
# --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}
# --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']} --extra-lib-dirs=#{RbConfig::CONFIG['libdir']} --user --enable-shared --with-ghc=#{ghc_version}"
- command="cabal update; cabal install zlib --enable-shared; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user --enable-shared --with-ghc=#{ghc_version} --verbose --disable-library-profiling"
+ command="cabal install zlib --enable-shared; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user --enable-shared --with-ghc=#{ghc_version} --verbose --disable-library-profiling"
puts "running #{command}"
result=%x{#{command}}
end

0 comments on commit 670e210

Please sign in to comment.