Merge pull request #445 from sorki/srk/chores

Chores
Haskell-Things · Nov 7, 2023 · 2d026d3 · 2d026d3
2 parents 874cb76 + f60ae09
commit 2d026d3
Show file tree

Hide file tree

Showing 40 changed files with 996 additions and 211 deletions.
diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall
@@ -4,12 +4,11 @@ in    haskellCi.generalCi
         haskellCi.matrixSteps
         ( Some
             { ghc =
-              [ haskellCi.GHC.GHC902
+              [ haskellCi.GHC.GHC947
+              , haskellCi.GHC.GHC902
               , haskellCi.GHC.GHC8107
-              , haskellCi.GHC.GHC884
-              , haskellCi.GHC.GHC865
               ]
-            , cabal = [ haskellCi.Cabal.Cabal34 ]
+            , cabal = [ haskellCi.Cabal.Cabal310 ]
             }
         )
         // { on = [ haskellCi.Event.push

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,7 +4,7 @@ jobs:
     steps:
       - uses: "actions/checkout@v3"
       - id: setup-haskell-cabal
-        uses: "haskell/actions/setup@v2"
+        uses: "haskell-actions/setup@v2"
         with:
           cabal-version: "${{ matrix.cabal }}"
           enable-stack: false
@@ -17,7 +17,7 @@ jobs:
             cp cabal.project.local.ci cabal.project.local
           fi
       - name: freeze
-        run: cabal freeze
+        run: cabal freeze --enable-tests --enable-benchmarks
       - uses: "actions/cache@v3"
         with:
           key: "${{ runner.os }}-${{ matrix.ghc }}-cabal-${{ hashFiles('cabal.project.freeze') }}"
@@ -35,12 +35,11 @@ jobs:
     strategy:
       matrix:
         cabal:
-          - '3.4'
+          - '3.10'
         ghc:
+          - '9.4.7'
           - '9.0.2'
           - '8.10.7'
-          - '8.8.4'
-          - '8.6.5'
 name: Haskell CI
 on:
   - push

diff --git a/.github/workflows/ormolu.yaml b/.github/workflows/ormolu.yaml
@@ -1,23 +1,24 @@
 # FUTUREWORK: add this to `ci.dhall`?
+# TODO(srk): ^^
 
 name: Ormolu
 on:
   - pull_request
 
 jobs:
   ormolu:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: "actions/checkout@v1"
+      - uses: "actions/checkout@v3"
 
-      - uses: "actions/setup-haskell@v1.1.4"
+      - uses: "haskell-actions/setup@v2"
         id: setup-haskell-cabal
         with:
           cabal-version: "${{ matrix.cabal }}"
           enable-stack: false
           ghc-version: "${{ matrix.ghc }}"
 
-      - uses: "actions/cache@v2"
+      - uses: "actions/cache@v3"
         name: Cache
         with:
           key: "${{ runner.os }}"
@@ -46,6 +47,6 @@ jobs:
     strategy:
       matrix:
         cabal:
-          - '3.2'
+          - '3.10'
         ghc:
-          - '8.10.1'
+          - '9.4.7'
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,11 @@
 *.stl
 !tests/golden/*.stl
 *.svg
+*.ascii.stl
+*.asciistl
+*.three.js
+*.threejs
+*.obj
 # Generated by the build process
 cabal.project.local
 Setup
@@ -36,3 +41,8 @@ Examples/example[0-9][0-9]
 /.settings
 /.project
 stack.yaml.lock
+/attic/
+# direnv
+.envrc
+.ghci
+.ghci_history