Remove references to dev/prod templating in CI and makefile scripts.

haskell · Apr 18, 2021 · 9477d73 · 9477d73
1 parent ca98108
commit 9477d73
Show file tree

Hide file tree

Showing 22 changed files with 57 additions and 1,093 deletions.
diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
@@ -27,8 +27,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3.8 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-linux
@@ -62,8 +62,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package project
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
-          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarexe=sdist/sdist/cabal-install-*.tar.gz
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
+          python3 release.py --tarlib=sdist/sdist/Cabal-*.tar.gz --tarsolver=sdist/sdist/cabal-install-solver-3.*.tar.gz --tarexe=sdist/sdist/cabal-install-3.*.tar.gz
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-macos
@@ -93,9 +93,9 @@ jobs:
       - name: Package project
         # We hardcode version 3 here to make first glob not overlap with cabal-install
         run: |
-          cabal v2-sdist --builddir=sdist Cabal cabal-install
+          cabal v2-sdist --builddir=sdist Cabal cabal-install-solver cabal-install
           New-Item -Path "_build" -ItemType "directory"
-          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
+          python release.py --tarlib=$(Resolve-Path -Path sdist/sdist/Cabal-3.*.tar.gz) --tarsolver=$(Resolve-Path -Path sdist/sdist/cabal-install-solver-3.*.tar.gz) --tarexe=$(Resolve-Path -Path sdist/sdist/cabal-install-3.*.tar.gz)
       - uses: actions/upload-artifact@v2
         with:
           name: cabal-windows

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -319,19 +319,15 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-8.0.2 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-8.0.2 -v --lib-only -s lib-suite
   validate-7_10_3:
     name: validate.sh ghc-7.10.3
     runs-on: ubuntu-18.04
@@ -365,19 +361,15 @@ jobs:
           git fetch origin $GITHUB_SHA:temporary-ci-branch
           git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
       - name: Validate print-config
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-config
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s print-config
       - name: Validate print-tool-versions
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s print-tool-versions
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s print-tool-versions
       - name: Validate build
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s build
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s build
       - name: Validate lib-tests
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s lib-tests
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s lib-tests
       - name: Validate lib-suite
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s lib-suite
-      - name: Validate cli-tests
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s cli-tests
-      - name: Validate cli-suite
-        run: sh validate.sh -j 2 -w ghc-7.10.3 -v  -s cli-suite
+        run: sh validate.sh -j 2 -w ghc-7.10.3 -v --lib-only -s lib-suite
   validate-7_8_4:
     name: validate.sh ghc-7.8.4
     runs-on: ubuntu-18.04

diff --git a/.github/workflows/quick-jobs.yml b/.github/workflows/quick-jobs.yml
@@ -41,7 +41,6 @@ jobs:
           make -B spdx
           make -B templates
           make -B github-actions
-          make -B cabal-install-cabal
       - name: Check that diff is clean
         run: |
           git status > /dev/null

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -37,8 +37,6 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v2
-      - name: make cabal-install-dev
-        run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
       # We cannot ask for all dependencies, but we can for Cabal.
       - name: cabal v2-build Cabal --only-dependencies
         run: cabal v2-build Cabal --only-dependencies
@@ -51,10 +49,10 @@ jobs:
         run: |
           cd cabal-install
           cabal v2-run cabal-install:memory-usage-tests
-      - name: cabal-install solver-quickcheck
+      - name: cabal-install long-tests
         run: |
           cd cabal-install
-          cabal v2-run cabal-install:solver-quickcheck
+          cabal v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-install integration-tests2
         run: |
           cd cabal-install
@@ -87,8 +85,6 @@ jobs:
       - name: Update Hackage index
         run: cabal v2-update
       - uses: actions/checkout@v2
-      - name: make cabal-install-dev
-        run: cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
       # We cannot ask for all dependencies, but we can for Cabal.
       - name: cabal v2-build Cabal --only-dependencies
         run: cabal v2-build Cabal --only-dependencies
@@ -101,10 +97,10 @@ jobs:
         run: |
           cd cabal-install
           cabal v2-run cabal-install:memory-usage-tests
-      - name: cabal-install solver-quickcheck
+      - name: cabal-install long-tests
         run: |
           cd cabal-install
-          cabal v2-run cabal-install:solver-quickcheck
+          cabal v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
       - name: cabal-install integration-tests2
         run: |
           cd cabal-install

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -137,9 +137,9 @@ There are also other test suites:
   on some utility functions in cabal-install you should run this test
   suite.
 
-* `cabal-install:solver-quickcheck` are QuickCheck tests on
-  cabal-install's dependency solver.  If you are working
-  on the solver you should run this test suite.
+* `cabal-install:long-tests` are QuickCheck tests on
+  cabal-install's dependency solver, VCS, and file monitoring code.
+  If you are working on the solver you should run this test suite.
 
 * `cabal-install:integration-tests2` are integration tests on some
   top-level API functions inside the `cabal-install` source code.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 .PHONY : all lexer sdpx lib exe doctest
-.PHONY : cabal-install-dev cabal-install-prod
 .PHONY : phony
 
 CABALBUILD := cabal v2-build
@@ -97,7 +96,7 @@ doctest :
 
 # This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
 doctest-cli :
-	doctest -D__DOCTEST__ --fast cabal-install/src cabal-install/cabal-install-solver/src cabal-install/cabal-install-solver/src-assertion
+	doctest -D__DOCTEST__ --fast cabal-install/src cabal-install-solver/src cabal-install-solver/src-assertion
 
 # tests
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -47,7 +47,6 @@ cache:
   - "C:\\sr"
 
 build_script:
-  - cp cabal-install/cabal-install.cabal.dev cabal-install/cabal-install.cabal
   - cabal %CABOPTS% v2-configure --enable-tests
   - appveyor-retry cabal %CABOPTS% v2-build lib:Cabal --only-dependencies
   - cabal %CABOPTS% v2-build lib:Cabal
@@ -59,6 +58,6 @@ build_script:
   - appveyor-retry cabal %CABOPTS% v2-build cabal-install:tests --only-dependencies
   - cd cabal-install
   - cabal %CABOPTS% v2-run cabal-install:memory-usage-tests
-  - cabal %CABOPTS% v2-run cabal-install:solver-quickcheck
+  - cabal %CABOPTS% v2-run cabal-install:long-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"
   - cabal %CABOPTS% v2-run cabal-install:integration-tests2
   - cabal %CABOPTS% v2-run cabal-install:unit-tests -- --pattern "! (/FileMonitor/ || /VCS/ || /Get/)"