diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index e2f4eac..4f3e0e8 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -15,7 +15,7 @@ jobs: with: enable-stack: true stack-no-global: true - stack-version: 'latest' + stack-version: latest - name: Cache uses: actions/cache@v2 @@ -24,8 +24,8 @@ jobs: ~/.stack graphql.cabal stack.yaml.lock - key: ${{ runner.os }}-build-${{ hashFiles('**/stack.yaml') }} - restore-keys: '${{ runner.os }}-build-' + key: ${{ runner.os }}-test-${{ hashFiles('**/stack.yaml') }} + restore-keys: ${{ runner.os }}-test- - name: Install dependencies run: stack --no-terminal test --only-snapshot @@ -45,7 +45,7 @@ jobs: with: enable-stack: true stack-no-global: true - stack-version: 'latest' + stack-version: latest - name: Cache uses: actions/cache@v2 @@ -54,8 +54,8 @@ jobs: ~/.stack graphql.cabal stack.yaml.lock - key: ${{ runner.os }}-build-${{ hashFiles('**/stack.yaml') }} - restore-keys: '${{ runner.os }}-build-' + key: ${{ runner.os }}-lint-${{ hashFiles('**/stack.yaml') }} + restore-keys: ${{ runner.os }}-lint- - name: Build HLint run: stack --no-terminal build hlint diff --git a/semaphoreci.sh b/semaphoreci.sh deleted file mode 100755 index d7c8a93..0000000 --- a/semaphoreci.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -STACK=$SEMAPHORE_CACHE_DIR/stack -export STACK_ROOT=$SEMAPHORE_CACHE_DIR/.stack - -setup() { - if [ ! -e "$STACK" ] - then - curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C $SEMAPHORE_CACHE_DIR '*/stack' - fi - if [ -e "$SEMAPHORE_CACHE_DIR/graphql.cabal" ] - then - cp -a $SEMAPHORE_CACHE_DIR/graphql.cabal graphql.cabal - fi - $STACK --no-terminal setup - cp -a graphql.cabal $SEMAPHORE_CACHE_DIR/graphql.cabal -} - -setup_test() { - $STACK --no-terminal test --only-snapshot -} - -test() { - $STACK --no-terminal test --pedantic -} - -test_docs() { - $STACK --no-terminal ghc -- -Wall -Werror -fno-code docs/tutorial/tutorial.lhs - $STACK --no-terminal haddock --no-haddock-deps -} - -setup_lint() { - $STACK --no-terminal install hlint -} - -lint() { - $STACK --no-terminal exec hlint -- src tests -} - -$1