Merge branch 'IntersectMBO:master' into master

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,7 +7,7 @@ Add your description here, if it fixes a particular issue please provide a [link
 - [ ] Commit sequence broadly makes sense
 - [ ] Commits have useful messages
 - [ ] New tests are added if needed and existing tests are updated
-- [ ] Any changes are noted in the [changelog](https://github.com/IntersectMBO/cardano-db-sync/blob/master/cardano-db-sync/CHANGELOG.md)
+- [ ] Any changes are noted in the [changelog](https://github.com/IntersectMBO/cardano-db-sync/blob/master/db-sync/CHANGELOG.md)
 - [ ] Code is formatted with [`fourmolu`](https://github.com/fourmolu/fourmolu) on version 0.10.1.0 (which can be run with `scripts/fourmolize.sh`)
 - [ ] Self-reviewed the diff
 

.github/workflows/haskell.yml

@@ -19,12 +19,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        compiler-nix-name: [ghc810, ghc96]
+        # TODO: Add ghc910 when input-output-hk/devx is fixed
+        compiler-nix-name: [ghc810, ghc96, ghc98]
         include:
           # We want a single job, because macOS runners are scarce.
           - os: macos-latest
             compiler-nix-name: ghc96
 
+    env:
+      # Increment this value to "invalidate" the cabal cache. Be sure to do this
+      # after updating dependencies (Hackage or chap)
+      CABAL_CACHE_VERSION: 1
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -37,19 +43,14 @@ jobs:
           minimal: false
           # enable IOG-full flavour to bring in all the crypto libraries we need.
           iog-full: true
-      - name: "macOS: clean up pre-installed libraries"
-        if: runner.os == 'macOS'
-        # Homebrew's icu4c conflics with Nix's
-        run: |
-          brew uninstall --ignore-dependencies icu4c
       - name: cache cabal
         uses: actions/cache@v3
         with:
           path: |
             ~/.cabal-devx/packages
             ~/.cabal-devx/store
-          key: ${{ runner.os }}-${{ matrix.compiler-nix-name }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
-          restore-keys: ${{ runner.os }}-${{ matrix.compiler-nix-name }}-
+          key: ${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ matrix.compiler-nix-name }}-${{ hashFiles('**/*.cabal', '**/cabal.project', '**/cabal.project.freeze') }}
+          restore-keys: ${{ env.CABAL_CACHE_VERSION }}-${{ runner.os }}-${{ matrix.compiler-nix-name }}-
       - name: cabal update
         run: cabal update
       - name: cabal build dependencies

.gitignore

@@ -1,16 +1,34 @@
-dist-newstyle/
+# Haskell
+.ghc.environment.*
 .stack-work/
+cabal.project.local
+dist-newstyle/
 dist
-*.swp
+
+*.prof
+*.aux
+*.hp
+*.eventlog
+
 log-dir
-result*
 launch_*
-cabal.project.local
 gen/
-/.vscode
-.DS_Store
-
 cardano-chain-gen/test/testfiles/temp/
 /secp256k1/
 
-.ghc.environment.*
+# Vim
+*.swp
+
+# Emacs
+.dir-locals.el
+
+# Nix
+.direnv
+.envrc
+result*
+
+# VS Code
+/.vscode
+
+# MacOS
+.DS_Store