Skip to content

Commit

Permalink
Change CI script again
Browse files Browse the repository at this point in the history
  • Loading branch information
knothed committed Jun 16, 2021
1 parent 87875e2 commit fba7e6c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
10 changes: 1 addition & 9 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,9 @@ install:
- "cabal --version"
- "ghc --version"
- "cabal %CABOPTS% v2-update -vverbose+nowrap"
- "cabal %CABOPTS% v2-install alex --bindir=/hsbin"
- "alex --version"

build: off

test_script:
- "cd %APPVEYOR_BUILD_FOLDER%"
- |
if [[ $(ghc --numeric-version) < "8" ]]
then
cabal test -f -bootstrap
else
make sdist-test
fi
- "cabal test -f -bootstrap"
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# language: haskell

# Keep the list of tested GHC versions in sync with `tested-with` in `alex.cabal`.
# Keep the list of tested GHC versions in sync with `tested-with` in `happy.cabal`.
env:
- GHCVER=7.0.4
- GHCVER=7.4.2
Expand All @@ -17,17 +17,17 @@ env:
before_install:
- sudo add-apt-repository -y ppa:hvr/ghc
- sudo apt-get update
- sudo apt-get install alex-3.1.7 cabal-install-3.4 ghc-$GHCVER
- export PATH=/opt/cabal/3.4/bin:/opt/ghc/$GHCVER/bin:/opt/alex/3.1.7/bin:$PATH
- sudo apt-get install cabal-install-3.4 ghc-$GHCVER
- export PATH=/opt/cabal/3.4/bin:/opt/ghc/$GHCVER/bin:$PATH

install:
- cabal update

script:
- |
if [[ $(ghc --numeric-version) < "8" ]]
if [[ $(ghc --numeric-version) == "8.10.1" ]] # only perform make sdist-test once
then
cabal test -f -bootstrap
else
make sdist-test
else
cabal test -f -bootstrap
fi

0 comments on commit fba7e6c

Please sign in to comment.