Amend validate.sh and github workflows to not call make-cabal-install…

…-dev
haskell · Apr 14, 2021 · 59b2fe5 · 59b2fe5
1 parent f8e2383
commit 59b2fe5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 26 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -93,8 +93,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.10.1 -v  -s build
       - name: Validate lib-tests
@@ -140,8 +138,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s build
       - name: Validate lib-tests
@@ -188,8 +184,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s build
       - name: Validate lib-tests
@@ -236,8 +230,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.4.4 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.4.4 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.4.4 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.4.4 -v  -s build
       - name: Validate lib-tests
@@ -284,8 +276,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.2.2 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.2.2 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.2.2 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.2.2 -v  -s build
       - name: Validate lib-tests
@@ -332,8 +322,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s build
       - name: Validate lib-tests
@@ -380,8 +368,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s build
       - name: Validate lib-tests

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -57,8 +57,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.8.3 -v  -s build
       - name: Validate lib-tests
@@ -112,8 +110,6 @@ jobs:
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v  -s print-config
       - name: Validate print-tool-versions
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v  -s print-tool-versions
-      - name: Validate make-cabal-install-dev
-        run: sh validate.sh -j 2 -w ghc-8.6.5 -v  -s make-cabal-install-dev
       - name: Validate build
         run: sh validate.sh -j 2 -w ghc-8.6.5 -v  -s build
       - name: Validate lib-tests

diff --git a/validate.sh b/validate.sh
@@ -259,7 +259,6 @@ fi
 
 if [ -z "$STEPS" ]; then
     STEPS="print-config print-tool-versions"
-    if ! $LIBONLY;  then STEPS="$STEPS make-cabal-install-dev"; fi
     STEPS="$STEPS build"
     if $DOCTEST;    then STEPS="$STEPS doctest";   fi
     if $LIBTESTS;   then STEPS="$STEPS lib-tests"; fi
@@ -359,11 +358,6 @@ step_time_summary() {
 # build
 #######################################################################
 
-step_make_cabal_install_dev() {
-print_header "make cabal-install-dev"
-timed cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
-}
-
 step_build() {
 print_header "build"
 timed $CABALNEWBUILD $TARGETS --dry-run || exit 1
@@ -487,7 +481,6 @@ for step in $STEPS; do
     case $step in
         print-config)             step_print_config            ;;
         print-tool-versions)      step_print_tool_versions     ;;
-        make-cabal-install-dev)   step_make_cabal_install_dev  ;;
         build)                    step_build                   ;;
         doctest)                  step_doctest                 ;;
         lib-tests)                step_lib_tests               ;;
@@ -498,7 +491,7 @@ for step in $STEPS; do
         solver-benchmarks-tests)  step_solver_benchmarks_tests ;;
         solver-benchmarks-run)    step_solver_benchmarks_run   ;;
         time-summary)             step_time_summary            ;;
-        *) 
+        *)
             echo "Invalid step $step"
             exit 1
             ;;