Skip to content

Commit 6c5adc4

Browse files
committed
Merge branch 'main' into fraser-iohk/kes-agent-rebase
post-merge: remove redundant imports / dependencies
1 parent 3228821 commit 6c5adc4

File tree

940 files changed

+100932
-88875
lines changed

Some content is hidden

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

940 files changed

+100932
-88875
lines changed

.git-blame-ignore-revs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### NOTE
2+
# Run `git config blame.ignoreRevsFile .git-blame-ignore-revs`
3+
# from the repository's root to tell `git blame` to ignore
4+
# the commits below.
5+
6+
# 2025
7+
########################################
8+
# Format with fourmolu
9+
70c3258667611a12f7fa8f85b5591830c533d296

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
id: setup-haskell
8989
with:
9090
cabal-version: "3.12.1.0"
91-
ghc-version: "9.6.6"
91+
ghc-version: "9.6.7"
9292

9393
- name: Install base libraries
9494
uses: input-output-hk/actions/base@latest

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
ghc: ["8.10.7", "9.6.6", "9.10.1", "9.12"]
41+
ghc: ["9.6.7", "9.10.2", "9.12.2"]
4242
variant: [default, no-thunks]
4343
test-set: [all, no-thunks-safe]
4444
exclude:
@@ -163,7 +163,7 @@ jobs:
163163
if: |
164164
github.event_name == 'push'
165165
&& github.ref == 'refs/heads/main'
166-
&& matrix.ghc=='9.10.1'
166+
&& matrix.ghc=='9.10.2'
167167
run: |
168168
# need for latex, dvisvgm and standalone
169169
sudo apt install texlive-latex-extra texlive-latex-base
@@ -178,7 +178,7 @@ jobs:
178178
if: |
179179
github.event_name == 'push'
180180
&& github.ref == 'refs/heads/main'
181-
&& matrix.ghc=='9.10.1'
181+
&& matrix.ghc=='9.10.2'
182182
uses: actions/upload-artifact@v4
183183
with:
184184
name: haddocks
@@ -193,7 +193,7 @@ jobs:
193193
strategy:
194194
fail-fast: false
195195
matrix:
196-
ghc: ["8.10.7", "9.6.6", "9.10.1"]
196+
ghc: ["9.6.7", "9.10.2"]
197197

198198
steps:
199199
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)