Merge pull request #28 from sol/master

Haskell: Run `cabal update` before running any other scripts
travis-ci · Aug 8, 2012 · 177babd · 177babd
2 parents c142f8d + 941998f
commit 177babd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/travis/build/job/test/haskell.rb b/lib/travis/build/job/test/haskell.rb
@@ -10,10 +10,11 @@ def setup
             super
             announce_ghc
             announce_cabal
+            cabal_update
           end
 
           def install
-            "cabal update && cabal install --enable-tests"
+            "cabal install --enable-tests"
           end
 
           def script
@@ -29,6 +30,10 @@ def announce_ghc
             def announce_cabal
               shell.execute("cabal --version")
             end
+
+            def cabal_update
+              shell.execute("cabal update")
+            end
         end
       end
     end

diff --git a/spec/build/job/test/haskell_spec.rb b/spec/build/job/test/haskell_spec.rb
@@ -10,7 +10,7 @@
 
   describe 'install' do
     it "uses cabal" do
-      job.install.should == "cabal update && cabal install --enable-tests"
+      job.install.should == "cabal install --enable-tests"
     end
   end