No cabal-install in integration tests

commercialhaskell · Apr 7, 2019 · ba463f5 · ba463f5
1 parent c960c38
commit ba463f5
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 24 deletions.
diff --git a/.azure/azure-nightly-template-linux.yml b/.azure/azure-nightly-template-linux.yml
@@ -32,13 +32,7 @@ jobs:
       source ~/.profile
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
       export PATH=$HOME/.local/bin:$PATH;
-      set -ex
-      stack install cabal-install
-      # FIXME: Note that cabal-install might not be required once
-      # https://github.com/commercialhaskell/stack/issues/4410 get's
-      # fixed.
       etc/scripts/integration-tests.sh
-      set +ex
     displayName: Integration Test
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;

diff --git a/.azure/azure-nightly-template-osx.yml b/.azure/azure-nightly-template-osx.yml
@@ -33,14 +33,8 @@ jobs:
       curl https://nixos.org/nix/install | sh
       . ~/.nix-profile/etc/profile.d/nix.sh
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
-      set -ex
       export PATH=/usr/local/opt/gnu-tar/libexec/gnubin:$HOME/.local/bin:$PATH;
-      stack install cabal-install
-      # FIXME: Note that cabal-install might not be required once
-      # https://github.com/commercialhaskell/stack/issues/4410 get's
-      # fixed.
       etc/scripts/integration-tests.sh
-      set +ex
     displayName: Integration Test
   - script: |
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;

diff --git a/.azure/azure-nightly-template-windows.yml b/.azure/azure-nightly-template-windows.yml
@@ -38,13 +38,7 @@ jobs:
       export STACK_ROOT="$(Build.SourcesDirectory)"/.stack-root;
       export PATH=$PATH:"/C/Program Files/Mercurial/"
       export TMP=/D/tmp
-      set -ex
-      stack install cabal-install
-      # FIXME: Note that cabal-install might not be required once
-      # https://github.com/commercialhaskell/stack/issues/4410 get's
-      # fixed.
       etc/scripts/integration-tests.sh
-      set +ex
     displayName: Integration Test
   - powershell: |
       $env:STACK_ROOT = "$(Build.SourcesDirectory)\.stack-root"

diff --git a/snapshot-lts-12.yaml b/snapshot-lts-12.yaml
@@ -1,6 +1,9 @@
 resolver: lts-12.20
 name: snapshot-for-building-stack-with-ghc-8.4.4
 
+drop-packages:
+- cabal-install
+
 packages:
 - Cabal-2.4.0.1@rev:0
 - githash-0.1.3.0@rev:0

diff --git a/snapshot-nightly.yaml b/snapshot-nightly.yaml
@@ -1,2 +1,5 @@
 resolver: nightly-2018-12-01
 name: snapshot-for-building-stack-with-ghc-8.6.2
+
+drop-packages:
+- cabal-install
diff --git a/snapshot.yaml b/snapshot.yaml
@@ -1,10 +1,12 @@
 resolver: lts-11.22
 name: snapshot-for-building-stack-with-ghc-8.2.2
 
+drop-packages:
+- cabal-install
+
 packages:
 - ansi-terminal-0.8.1@sha256:4cebbd2034dcd9029369c0a49c72666be8dacd11a2827d33bcfa539f2933614a,3116
 - Cabal-2.4.0.1@rev:0
-- cabal-install-2.4.0.0@rev:1
 - infer-license-0.2.0@rev:0 #for hpack-0.31
 - hpack-0.31.1@rev:0
 - githash-0.1.3.0@rev:0
@@ -19,8 +21,3 @@ packages:
 - happy-1.19.9@sha256:f8c774230735a390c287b2980cfcd2703d24d8dde85a01ea721b7b4b4c82944f,4667
 - fsnotify-0.3.0.1@rev:1
 - process-1.6.3.0@sha256:fc77cfe75a9653b8c54ae455ead8c06cb8adc4d7a340984d84d8ca880b579919,2370 #because of https://github.com/haskell/process/pull/101
-
-flags:
-  cabal-install:
-    # https://github.com/haskell/cabal/issues/4883
-    native-dns: false