Skip to content

Commit

Permalink
Simplify CI
Browse files Browse the repository at this point in the history
- Remove cabal-plan, we actually never call it (I think)
- Remove vendored cabal-doctest
- Remove few stray allow-newer clauses no longer necessary, apparently

Originally done by @gbaz in PR haskell#7907.
  • Loading branch information
andreabedini committed Feb 8, 2022
1 parent fe809fb commit 778fd58
Show file tree
Hide file tree
Showing 13 changed files with 0 additions and 969 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,6 @@ jobs:
run: |
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
- name: Install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
echo "de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz" | sha256sum -c -
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
rm -f cabal-plan.xz
chmod a+x $HOME/.cabal/bin/cabal-plan
- name: Update Hackage index
run: cabal v2-update

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@ jobs:
- name: Update Hackage index
run: cabal v2-update

- name: Install cabal-plan
run: |
cd $(mktemp -d)
# aeson +fast, so we don't wait for -O2
cabal v2-install cabal-plan --constraint='cabal-plan ^>=0.6.2.0' --constraint='aeson +fast' --constraint='cabal-plan +exe'
- uses: actions/checkout@v2

- name: Validate print-config
Expand Down
9 changes: 0 additions & 9 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,11 @@ packages: Cabal-described
packages: Cabal-tests/
packages: cabal-benchmarks/

packages: vendor/cabal-doctest-1.0.8

optional-packages: ./vendored/*/*.cabal

-- Remove after hackage-repo-tool release
allow-newer:
hackage-repo-tool:optparse-applicative

allow-newer:
hackage-security:Cabal

-- https://github.com/haskell-hvr/windns/pull/2
allow-newer: windns-0.1.0.1:base

-- avoiding extra dependencies
constraints: rere -rere-cfg
constraints: these -assoc
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.coverage
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ packages: Cabal-described
packages: Cabal-tests/
packages: cabal-benchmarks/

packages: vendor/cabal-doctest-1.0.8

-- Uncomment to allow picking up extra local unpacked deps:
--optional-packages: */

Expand Down
2 changes: 0 additions & 2 deletions cabal.project.libonly
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ packages: Cabal-tree-diff
packages: Cabal-described
packages: Cabal-tests

packages: vendor/cabal-doctest-1.0.8

tests: True

-- Uncomment to allow picking up extra local unpacked deps:
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.validate
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ packages: Cabal-described
packages: Cabal-tests
packages: cabal-benchmarks

packages: vendor/cabal-doctest-1.0.8

tests: True

-- avoiding extra dependencies
Expand Down
2 changes: 0 additions & 2 deletions cabal.project.validate.libonly
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ packages: Cabal-tree-diff
packages: Cabal-described
packages: Cabal-tests

packages: vendor/cabal-doctest-1.0.8

tests: True

write-ghc-environment-files: never
Expand Down
50 changes: 0 additions & 50 deletions vendor/cabal-doctest-1.0.8/ChangeLog.md

This file was deleted.

30 changes: 0 additions & 30 deletions vendor/cabal-doctest-1.0.8/LICENSE

This file was deleted.

Loading

0 comments on commit 778fd58

Please sign in to comment.