Merge pull request #66 from brandonchinn178/updates

Updates

Author: brandonchinn178

.github/workflows/ci.yml

@@ -4,25 +4,14 @@ on:
   push:
     branches:
       - main
+  schedule:
+    - cron: '0 0 * * *'
   workflow_call:
 
 jobs:
   build_and_test:
-    strategy:
-      matrix:
-        stack_yaml:
-          - stack-ghc-8.10.yaml
-          - stack-ghc-9.0.yaml
-          # - stack-ghc-9.2.yaml
-          - stack-ghc-9.4.yaml
-          - stack-persistent-2.13.yaml
-          - stack-persistent-2.14.yaml
-        include:
-          - stack_yaml: stack.yaml
-            latest: true
-
-    name: build_and_test (${{ matrix.stack_yaml }})
-    runs-on: ubuntu-22.04
+    name: build_and_test
+    runs-on: ubuntu-latest
     services:
       postgres:
         image: postgres:13.1
@@ -32,82 +21,178 @@ jobs:
         ports:
           - 5432:5432
     env:
-      STACK_YAML: ${{ matrix.stack_yaml }}
       TEST_POSTGRESQL: 1
 
     steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions/cache@v3
+      -
+        uses: actions/checkout@v3
+      -
+        uses: actions/cache@v3
         with:
           path: ~/.stack
-          key: ${{ runner.os }}-stack-cache-${{ hashFiles(matrix.stack_yaml, 'package.yaml') }}
-      - run: stack test --coverage
-
-      - name: Check that files are unmodified
+          key: ${{ runner.os }}-stack-cache-${{ hashFiles('stack.yaml', 'package.yaml') }}
+      -
+        run: stack test --coverage
+      -
+        name: Check that files are unmodified
         run: git diff --exit-code
-
-      # upload coverage data
-      - name: Generate coverage data
-        run: stack install hpc-lcov && hpc-lcov
-      - uses: codecov/codecov-action@v3
+      -
+        name: Check for any outdated packages
+        run: cabal outdated --exit-code
+      -
+        name: Generate coverage data
+        run: |
+          HPC_LCOV_VERSION=1.1.1
+          curl -fsSL \
+            "https://github.com/brandonchinn178/hpc-lcov/releases/download/v${HPC_LCOV_VERSION}/hpc-lcov-${HPC_LCOV_VERSION}-linux-x86_64" \
+            -o /usr/local/bin/hpc-lcov
+          chmod +x /usr/local/bin/hpc-lcov
+          hpc-lcov
+      -
+        uses: codecov/codecov-action@v3
         with:
           files: lcov.info
-        if: ${{ matrix.latest }}
+
+  compat_test:
+    strategy:
+      matrix:
+        ghc_version:
+          - '8.10'
+          - '9.0'
+          - '9.4'
+          - '9.6'
+        persistent_version:
+          - '2.13'
+          - '2.14'
+        include:
+          - ghc_version: '8.10.1'
+            persistent_version: '2.13'
+            oldest: true
+        exclude:
+          - ghc_version: '9.4'
+            persistent_version: '2.13'
+          - ghc_version: '9.6'
+            persistent_version: '2.13'
+
+    name: compat_test (ghc-${{ matrix.ghc_version }}, persistent-${{ matrix.persistent_version }})
+    runs-on: ubuntu-latest
+
+    steps:
+      -
+        uses: actions/checkout@v3
+      -
+        id: setup
+        name: Set up GHC ${{ matrix.ghc_version }}
+        uses: haskell-actions/setup@v2
+        with:
+          ghc-version: ${{ matrix.ghc_version }}
+      -
+        name: Configure the build
+        run:
+          cabal configure
+            --enable-test
+            --test-options='--color=always'
+            --test-show-details=streaming
+            --constraint='persistent ^>= ${{ matrix.persistent_version }}'
+            --constraint='persistent < 2.13.3.4 || >= 2.14.0.2'
+      -
+        # TODO: remove
+        if: ${{ matrix.ghc_version == '9.6' }}
+        run:
+          cabal configure
+            --enable-append
+            --allow-newer='persistent:template-haskell'
+            --allow-newer='unliftio-pool:transformers'
+            --allow-newer='explainable-predicates:base'
+            --allow-newer='explainable-predicates:template-haskell'
+      -
+        if: ${{ matrix.oldest }}
+        name: Use oldest dependencies
+        run:
+          cabal configure
+            --enable-append --prefer-oldest
+            --constraint 'conduit >= 1.3.1'
+            --constraint 'silently >= 0.0.3'
+            --constraint 'string-conversions >= 0.4'
+            --constraint 'unix-time >= 0.3.8'
+      -
+        name: Get build plan
+        run: cabal build --dry-run
+      -
+        name: Get current month to clear cache
+        run: echo "CURR_MONTH=$(date +%B)" | tee -a "$GITHUB_ENV"
+      -
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.setup.outputs.cabal-store }}
+          key: ${{ runner.os }}-cabal-cache-${{ env.CURR_MONTH }}-${{ matrix.ghc_version }}-${{ hashFiles('**/plan.json') }}
+          restore-keys: |
+               ${{ runner.os }}-cabal-cache-${{ env.CURR_MONTH }}-${{ matrix.ghc_version }}-
+      -
+        name: Build + Test
+        run: cabal test
 
   lint:
     runs-on: ubuntu-latest
     env:
       HLINT_VERSION: '3.5'
-      FOURMOLU_VERSION: '0.10.1.0'
+      FOURMOLU_VERSION: '0.13.0.0'
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Install hlint
+      -
+        uses: actions/checkout@v3
+      -
+        name: Install hlint
         run: |
           HLINT_ARCHIVE="hlint-${HLINT_VERSION}-x86_64-linux.tar.gz"
           curl -sSLO "https://github.com/ndmitchell/hlint/releases/download/v${HLINT_VERSION}/${HLINT_ARCHIVE}"
           tar xzf "${HLINT_ARCHIVE}" -C /usr/local/bin/ --strip-components=1 "hlint-${HLINT_VERSION}/hlint"
-
-      - name: Install fourmolu
+      -
+        name: Install fourmolu
         run: |
           curl -sSL \
             "https://github.com/fourmolu/fourmolu/releases/download/v${FOURMOLU_VERSION}/fourmolu-${FOURMOLU_VERSION}-linux-x86_64" \
             -o /usr/local/bin/fourmolu
           chmod +x /usr/local/bin/fourmolu
-
-      - run: pip install pre-commit
-      - run: pre-commit run --all-files -v --show-diff-on-failure
+      -
+        run: pip install pre-commit
+      -
+        run: pre-commit run --all-files -v --show-diff-on-failure
         env:
           SKIP: no-commit-to-branch
 
   check_sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      -
+        uses: actions/checkout@v3
+      -
+        uses: actions/cache@v3
         with:
           path: ~/.stack
           key: ${{ runner.os }}-check_sdist-${{ hashFiles('stack.yaml', 'package.yaml') }}
-
-      - name: Strip unreleased section from CHANGELOG
+      -
+        name: Strip unreleased section from CHANGELOG
         run: sed -i -n '/^# Unreleased/d; /^#/,$p' CHANGELOG.md
-
-      - name: Create sdist bundle
+      -
+        name: Create sdist bundle
         run: stack sdist --test-tarball --tar-dir .
-
-      - uses: actions/upload-artifact@v3
+      -
+        uses: actions/upload-artifact@v3
         with:
           name: persistent-mtl-sdist
           path: persistent-mtl-*.tar.gz
 
   check_codegen:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      -
+        uses: actions/checkout@v3
+      -
+        uses: actions/cache@v3
         with:
           path: ~/.stack
           key: ${{ runner.os }}-check_codegen-${{ hashFiles('stack.yaml') }}
-      - run: scripts/generate/run.sh
-      - run: git diff --exit-code *.hs
+      -
+        run: scripts/generate/run.sh
+      -
+        run: git diff --exit-code *.hs

.github/workflows/release.yml

@@ -11,43 +11,43 @@ jobs:
       - ci
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: main
-
-      - uses: actions/download-artifact@v3
+      -
+        uses: actions/checkout@v3
+      -
+        uses: actions/download-artifact@v3
         with:
           name: persistent-mtl-sdist
           path: ./sdist/
-
-      - uses: brandonchinn178/haskell-actions/parse-cabal-file@parse-cabal-file
+      -
         id: cabal_file
+        uses: haskell-actions/parse-cabal-file@v1
         with:
           cabal_file: persistent-mtl.cabal
-      - name: Set version label
+      -
+        name: Set version label
         run: echo 'VERSION=v${{ steps.cabal_file.outputs.version }}' >> "${GITHUB_ENV}"
-
-      - name: Load Hackage token secret name
+      -
         id: hackage_token_secret
+        name: Load Hackage token secret name
         run: |
           USERNAME="$(echo "${GITHUB_ACTOR}" | tr '[:lower:]' '[:upper:]' | tr '-' '_')"
           echo "name=HACKAGE_TOKEN_${USERNAME}" >> "${GITHUB_OUTPUT}"
-
-      - name: Get CHANGELOG section
+      -
+        name: Get CHANGELOG section
         run: |
           sed '/^# Unreleased/,/^$/d' CHANGELOG.md > /tmp/changelog-without-unreleased
           if [[ "$(head -n 1 /tmp/changelog-without-unreleased)" != "# ${VERSION}" ]]; then
             echo "CHANGELOG doesn't look updated" >&2
             exit 1
           fi
           sed '1 d; /^# v/,$ d' /tmp/changelog-without-unreleased > /tmp/changelog-body
-
-      - uses: brandonchinn178/haskell-actions/hackage-upload@hackage-upload
+      -
+        uses: haskell-actions/hackage-publish@v1
         with:
-          archive: sdist/persistent-mtl-*.tar.gz
-          token: ${{ secrets[steps.hackage_token_secret.outputs.name] }}
-
-      - uses: softprops/action-gh-release@v1
+          hackageToken: ${{ secrets[steps.hackage_token_secret.outputs.name] }}
+          packagesPath: ./sdist/
+      -
+        uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ env.VERSION }}
           body_path: /tmp/changelog-body

.gitignore

@@ -4,4 +4,5 @@
 .stack-work/
 stack-*.yaml.lock
 
-.ci/
+cabal.project.local*
+dist-newstyle/

cabal.project

@@ -0,0 +1,4 @@
+packages: .
+
+program-options
+  ghc-options: -Werror

package.yaml

@@ -12,27 +12,27 @@ extra-source-files:
   - README.md
   - test/goldens/**/*.golden
 
-ghc-options: -Wall
+ghc-options: -Wall -Wcompat -Wunused-packages
 
 github: brandonchinn178/persistent-mtl
 
 library:
   source-dirs: src
   dependencies:
     - base >= 4.14 && < 5
-    - conduit >= 1.3.4 && < 1.4
-    - containers >= 0.6 && < 0.7
-    - exceptions >= 0.10 && < 0.11
-    - monad-logger >= 0.3 && < 0.4
-    - mtl >= 2.2.2 && < 2.3
+    - conduit < 1.4
+    - containers < 0.7
+    - exceptions < 0.11
+    - monad-logger < 0.4
+    - mtl < 2.4
     - persistent >= 2.13 && < 2.15
-    - resource-pool >= 0.2.3.2 && < 1
-    - resourcet >= 1.2.4 && < 1.3
-    - text >= 1.2.4 && < 2.1
-    - transformers >= 0.5.6 && < 0.6
-    - unliftio >= 0.2 && < 0.3
-    - unliftio-core >= 0.2 && < 0.3
-    - unliftio-pool >= 0.2 && < 1
+    - resource-pool < 1
+    - resourcet < 1.4
+    - text < 2.1
+    - transformers < 0.7
+    - unliftio < 0.3
+    - unliftio-core < 0.3
+    - unliftio-pool < 1
 
   when:
     # https://gitlab.haskell.org/ghc/ghc/-/issues/20836
@@ -53,18 +53,17 @@ tests:
       - bytestring
       - conduit
       - containers
-      - esqueleto
-      - explainable-predicates
+      - esqueleto >= 3.5
+      - explainable-predicates >= 0.1.2.0
       - monad-logger
       - persistent
       - persistent-mtl
-      - persistent-postgresql
-      - persistent-sqlite
-      - persistent-template
+      - persistent-postgresql >= 2.13.0.0
+      - persistent-sqlite >= 2.13.0.3
       - resource-pool
       - resourcet
       - tasty
-      - tasty-autocollect
+      - tasty-autocollect >= 0.2.0.0
       - tasty-golden
       - tasty-hunit
       - text