Merge branch 'develop' into bump-constraint-extras

obsidiansystems · Jul 11, 2023 · a550f9f · a550f9f
2 parents ea63570 + 12f9de1
commit a550f9f
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 929 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -6,14 +6,14 @@ jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.4.4', '8.6.5', '8.8.4', '8.10.2', '9.0.1']
+        ghc: ['8.6.5', '8.8.4', '8.10.2', '9.0.1']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v2
-    - uses: haskell/actions/setup@v1
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache

diff --git a/.travis.yml b/.travis.yml
diff --git a/dependent-sum/ChangeLog.md → ChangeLog.md b/dependent-sum/ChangeLog.md → ChangeLog.md
@@ -1,5 +1,19 @@
 # Revision history for dependent-sum
 
+## 0.7.2.0 revision 1 - 2023-05-10
+
+Bump upper bound of `some` from `1.0.4` to `1.0.5`.
+
+There've been no changes to the parts of `some` re-exported from `dependent-sum` between `some-1.0.4` and `some-1.0.5`, so it is safe to do so.
+
+## 0.7.2.0 - 2022-12-22
+
+* Update to some-1.0.4.*
+
+## 0.7.1.1 - 2022-12-12
+
+* Support constraints-extras 0.4
+
 ## 0.7.1.0 revision 2 - 2021-12-28
 
 * Allow `some` up until `1.0.4`

diff --git a/dependent-sum-template/Setup.lhs → Setup.lhs b/dependent-sum-template/Setup.lhs → Setup.lhs
diff --git a/cabal.project b/cabal.project
diff --git a/dependent-sum-template/ChangeLog.md b/dependent-sum-template/ChangeLog.md
diff --git a/dependent-sum-template/dependent-sum-template.cabal b/dependent-sum-template/dependent-sum-template.cabal