Match the Stack config used for deployment and fix CI(#252)

Update the CI config so that PRs run on the fresh branch rather than the main branch.

Author: david-christiansen

.github/workflows/main.yml

@@ -31,7 +31,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          ref: hakyll
 
       - uses: haskell/actions/setup@v1
         name: Setup Haskell Stack
@@ -56,8 +55,8 @@ jobs:
         run:  stack exec --system-ghc site rebuild
 
       - name: Deploy
-        # No deploy from pull requests
-        if: ${{ github.event_name != 'pull_request' }}
+        # Deploy only from non-pull-request changes to hakyll branch
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/hakyll'}}
         run: |
             git config user.name github-actions
             git config user.email [email protected]

haskell-foundation.cabal

@@ -6,7 +6,7 @@ cabal-version:      2.0
 executable site
   main-is:          site.hs
   build-depends:    base == 4.*
-                  , hakyll ^>=4.15
+                  , hakyll ^>= 4.14
                   , monadlist
                   , pandoc >=2.11 && <2.20
                   , text

stack.yaml

@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-18.10
+resolver: lts-18.28
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.