⅄ trunk → 25-05-22-synhash

Author: mitchellwrosen

.github/workflows/cabal.yaml

@@ -0,0 +1,69 @@
+### Cabal is not supported by Unison. This workflow helps us keep the contributed cabal.project file in a good state,
+### but it is not a required workflow.
+
+### IMPORTANT: This workflow is loaded from the _target branch_ of the PR. That means that changes to it won’t take
+###            effect until after they are merged. To test changes to this workflow, replace `pull_request_target` with
+###            `pull_request` and open the PR from the same repo that it’s being merged into (not a fork). Remember to
+###            change back to `pull_request_target` before merging.
+
+name: Cabal
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  # Run on the post-merge result of every push to a PR that changes one of the relevant build files.
+  pull_request_target:
+    paths:
+      - '**.cabal'
+      - '**/cabal.project*'
+      # stack.yaml is included, because if it changed, it indicates that cabal.project probably needs to change.
+      - '**/stack.yaml'
+  # Allow manual runs
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+
+jobs:
+  smoke-test:
+    # Only build on one platform, because we’re mostly just checking that the cabal.project file is sane.
+    runs-on: ubuntu-24.04
+    steps:
+      # Since we’re using `on.pull_request_target`, this workflow would check out the code from the target branch by
+      # default. This step fetches the SHA for the merge commit, so we can check out that (as `on.pull_request` would
+      # do).
+      - uses: suzuki-shunsuke/get-pr-action@b002e41164d7a39586b41f17f9caca4e98a1efe4 # v0.1.0
+        id: get-pr
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{steps.get-pr.outputs.merge_commit_sha}}
+
+      - id: setup-haskell
+        uses: haskell-actions/setup@7909071ceec0344debcc968c6c7a96a52e8dd0d7 # v2.8.1
+        with:
+          ghc-version: '9.6.5' # Should match the version implied by the resolver in ../../stack.yaml.
+          cabal-version: '3.10.3.0' # Should match the version in ../../.vscode/settings.json.
+
+      - name: cache Cabal build artifacts
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+        with:
+          path: |
+            ${{ steps.setup-haskell.outputs.cabal-store }}
+            dist-newstyle
+          key: cabal-freeze-${{ hashFiles('**/cabal.project.freeze') }}
+          restore-keys: |
+            cabal-freeze
+
+      # --only-configure skips some build steps, but should ensure all dependencies are correct.
+      - id: build
+        run: cabal build all --only-configure --project-file contrib/cabal.project
+        continue-on-error: true
+
+      - uses: mainmatter/continue-on-error-comment@b2606cc5ef2525ec21692999676a19f047e3e082 # v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          outcome: ${{ steps.build.outcome }}
+          test-id: Cabal / smoke-test

contrib/cabal.project

@@ -1,3 +1,6 @@
+-- The Cabal build is unsupported. If this doesn’t work for you, we would welcome a PR, but also consider using the
+-- Stack (or Nix) build if possible.
+
 packages:
   codebase2/codebase
   codebase2/codebase-sqlite
@@ -6,13 +9,11 @@ packages:
   codebase2/core
   codebase2/util-serialization
   codebase2/util-term
-
   lib/orphans/network-uri-orphans-sqlite
   lib/orphans/unison-core-orphans-sqlite
   lib/orphans/unison-hash-orphans-aeson
   lib/orphans/unison-hash-orphans-sqlite
   lib/orphans/uuid-orphans-sqlite
-
   lib/unison-hash
   lib/unison-hashing
   lib/unison-prelude
@@ -25,13 +26,14 @@ packages:
   lib/unison-util-recursion
   lib/unison-util-relation
   lib/unison-util-rope
-
   parser-typechecker
-  unison-core
   unison-cli
+  unison-cli-integration
   unison-cli-main
+  unison-core
   unison-hashing-v2
   unison-merge
+  unison-runtime
   unison-share-api
   unison-share-projects-api
   unison-syntax
@@ -42,107 +44,43 @@ source-repository-package
   location: https://github.com/unisonweb/haskeline.git
   tag: 9275eea7982dabbf47be2ba078ced669ae7ef3d5
 
-constraints:
-  lsp == 2.3.0.0,
-  fsnotify == 0.4.1.0,
-  crypton-x509-store == 1.6.9,
-  servant == 0.20.1,
-  optparse-applicative == 0.18.1.0,
-  tls == 1.8.0
-
--- For now there is no way to apply ghc-options for all local packages
--- See https://cabal.readthedocs.io/en/latest/cabal-project.html#package-configuration-options
-package codebase
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package codebase-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package codebase-sqlite-hashing-v2
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package codebase-sync
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package util-serializatio
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package util-term
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package network-uri-orphans-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-core-orphans-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-hash-orphans-aeson
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-hash-orphans-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package uuid-orphans-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-hash
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-hashing
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-prelude
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-pretty-printer
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-sqlite
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-util-base32hex
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-util-bytes
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-util-cache
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-util-relation
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-util-rope
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package parser-typechecker
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-cli
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-core
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-hashing-v2
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-merge
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-share-api
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
--- adding -Wno-deprecations cause jose-0.10 has deprecated Crypto.JWT.addClaim
-package unison-share-projects-api
-  ghc-options: -Wall -Werror -Wno-deprecations -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package unison-syntax
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
-
-package easytest
-  ghc-options: -Wall -Werror -Wno-name-shadowing -Wno-type-defaults -Wno-missing-pattern-synonym-signatures -fprint-expanded-synonyms -fwrite-ide-info
+source-repository-package
+  type: git
+  location: https://github.com/ChrisPenner/hs-mcp.git
+  tag: d8564c70ca09e333b7ce1717d1ac97a62d62966c
 
--- This options are applied to all packages, local ones and also external dependencies.
+constraints:
+  fuzzyfind ==3.0.2,
+  lock-file ==0.7.0.0,
+  monad-validat ==1.3.0.0,
+  recover-rtti ==0.4.3,
+  numerals ==0.4.1,
+  network-udp ==0.0.0,
+  hashtables ==1.4.2,
+
+package haskeline
+  flags: -terminfo
+
+-- Use scoped wildcards to match the corresponding `allow-newer-deps` behavior from ../stack.yaml.
+allow-newer:
+  numerals:*
+
+program-options
+  -- This should generally match the corresponding list in ../stack.yaml.
+  ghc-options:
+    -Wall
+    -Werror
+    -Wno-missing-pattern-synonym-signatures
+    -Wno-name-shadowing
+    -Wno-type-defaults
+    -Wunused-packages
+    -- Don’t error on deprecations, because the Cabal solver may select a newer version than is in Stackage, so we can’t
+    -- necessarily remove uses of deprecated definitions.
+    -Wwarn=deprecations
+    -fprint-expanded-synonyms
+    -funbox-strict-fields
+    -fwrite-ide-info
+
+-- These options are applied to all packages, local ones and also external dependencies.
 package *
   ghc-options: -haddock