Skip to content

Commit 6652201

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into topic/direct-murmur
2 parents 157973b + a330f60 commit 6652201

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1861
-2380
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ jobs:
231231
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
232232
with:
233233
path: ${{env.transcript_test_results}}
234-
key: transcripts-results-${{ matrix.os }}-${{ hashFiles('**/ci.yaml', '**/stack.yaml', '**/package.yaml', '**/*.hs')}}-${{ hashFiles('**/unison-src/**/*.md', '**/unison-src/**/*.u') }}
234+
key: transcripts-results-${{ matrix.os }}-${{ hashFiles('**/ci.yaml', '**/stack.yaml', '**/package.yaml', '**/*.hs')}}-${{ hashFiles('**/unison-src/**/*.md', '**/unison-src/**/*.u', '**/docs/*.md', '**/docs/*.markdown') }}
235235
- name: restore binaries
236236
uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
237237
if: steps.cache-transcript-test-results.outputs.cache-hit != 'true'

codebase2/codebase-sqlite/U/Codebase/Sqlite/NameLookups.hs

Lines changed: 0 additions & 68 deletions
This file was deleted.

codebase2/codebase-sqlite/U/Codebase/Sqlite/NamedRef.hs

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)