Skip to content

Commit 749b1fa

Browse files
authored
Merge branch 'main' into dnadales/remove-discord-link
2 parents f2d6b7b + 3647aa0 commit 749b1fa

File tree

35 files changed

+4557
-2561
lines changed

35 files changed

+4557
-2561
lines changed

.github/workflows/checks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232

33-
- uses: actions/checkout@v5
33+
- uses: actions/checkout@v6
3434
with:
3535
fetch-depth: 0
3636

@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
cabal-version: "3.10.1.0"
5555

56-
- uses: actions/checkout@v5
56+
- uses: actions/checkout@v6
5757

5858
- name: Cabal check
5959
run: ./scripts/ci/check-cabal-files.sh
@@ -65,7 +65,7 @@ jobs:
6565
runs-on: ubuntu-latest
6666

6767
steps:
68-
- uses: actions/checkout@v5
68+
- uses: actions/checkout@v6
6969

7070
- name: Check README badges
7171
run: |
@@ -104,7 +104,7 @@ jobs:
104104
mkdir -p ${HOME}/.local/bin
105105
mv cabal-plan ${HOME}/.local/bin/cabal-plan
106106
107-
- uses: actions/checkout@v5
107+
- uses: actions/checkout@v6
108108

109109
- name: Diff plans
110110
run: GH=1 ./scripts/release/cabal-plan-diff.sh
@@ -115,7 +115,7 @@ jobs:
115115
runs-on: ubuntu-latest
116116

117117
steps:
118-
- uses: actions/checkout@v5
118+
- uses: actions/checkout@v6
119119
- uses: serokell/xrefcheck-action@v1
120120
with:
121121
xrefcheck-version: 0.3.1

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
CABAL: "3.12.1.0"
5454

5555
steps:
56-
- uses: actions/checkout@v5
56+
- uses: actions/checkout@v6
5757

5858
- name: Check CDDLs up-to-date with Blueprints
5959
continue-on-error: true
@@ -212,7 +212,7 @@ jobs:
212212
ghc: ["9.6.7", "9.10.2"]
213213

214214
steps:
215-
- uses: actions/checkout@v5
215+
- uses: actions/checkout@v6
216216

217217
- name: Install base libraries
218218
uses: input-output-hk/actions/base@latest
@@ -289,7 +289,7 @@ jobs:
289289
strategy:
290290
fail-fast: false
291291
steps:
292-
- uses: actions/checkout@v5
292+
- uses: actions/checkout@v6
293293

294294
- uses: actions/setup-node@v6
295295
with:

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
fail-fast: false
2727

2828
steps:
29-
- uses: actions/checkout@v5
29+
- uses: actions/checkout@v6
3030
- uses: actions/setup-node@v6
3131
with:
32-
node-version: 18
32+
node-version: 20
3333
cache: yarn
3434
cache-dependency-path: './docs/website/yarn.lock'
3535

cabal.project

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,19 @@ source-repository-package
8080
eras/byron/ledger/impl
8181
eras/byron/crypto
8282

83-
-- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161
83+
allow-newer:
84+
-- https://github.com/phadej/vec/issues/121
85+
, ral:QuickCheck
86+
, fin:QuickCheck
87+
, bin:QuickCheck
88+
89+
-- Using https://github.com/IntersectMBO/ouroboros-network/tree/peras-staging/pr-5202-v2
8490
source-repository-package
8591
type: git
8692
location: https://github.com/IntersectMBO/ouroboros-network
87-
tag: 1385b53cefb81e79553b6b0252537455833ea9c4
88-
--sha256: sha256-zZ7WsMfRs1fG16bmvI5vIh4fhQ8RGyEvYGLSWlrxpg0=
93+
tag: 0db8669b67982cba755e80bf2e413527def41244
94+
--sha256: sha256-vEO721Xab0RTVKFQFKal5VCV5y+OUzELo8+7Z8TETJQ=
8995
subdir:
96+
ouroboros-network-protocols
9097
ouroboros-network-api
9198
ouroboros-network

docs/website/docusaurus.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const config = {
2727
projectName: 'ouroboros-consensus',
2828

2929
onBrokenLinks: 'throw',
30-
onBrokenMarkdownLinks: 'warn',
3130

3231
// Even if you don't use internalization, you can use this field to set useful
3332
// metadata like html lang. For example, if your site is Chinese, you may want
@@ -42,6 +41,9 @@ const config = {
4241
// We don't want to use MDX, as this requires escaping `<` and `{` symbols, which is quite inconvenient.
4342
// See: https://docusaurus.io/docs/markdown-features#mdx-vs-commonmark
4443
format: 'detect',
44+
hooks: {
45+
onBrokenMarkdownLinks: 'warn',
46+
},
4547
},
4648

4749
themes: ['@docusaurus/theme-mermaid'],

docs/website/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
"write-heading-ids": "docusaurus write-heading-ids"
1616
},
1717
"dependencies": {
18-
"@docusaurus/core": "^3.7.0",
19-
"@docusaurus/plugin-client-redirects": "3.7.0",
20-
"@docusaurus/preset-classic": "^3.7.0",
21-
"@docusaurus/theme-mermaid": "^3.7.0",
22-
"@mdx-js/react": "^3.0.1",
18+
"@docusaurus/core": "^3.9.2",
19+
"@docusaurus/plugin-client-redirects": "3.9.2",
20+
"@docusaurus/preset-classic": "^3.9.2",
21+
"@docusaurus/theme-mermaid": "^3.9.2",
22+
"@mdx-js/react": "^3.1.1",
2323
"clsx": "^2.1.1",
2424
"hast-util-is-element": "3.0.0",
2525
"prism-react-renderer": "^2.4.1",
26-
"react": "19.1.0",
27-
"react-dom": "19.1.0",
26+
"react": "19.2.0",
27+
"react-dom": "19.2.0",
2828
"rehype-katex": "7.0.1",
2929
"remark-math": "6.0.0"
3030
},
3131
"devDependencies": {
32-
"@docusaurus/module-type-aliases": "3.7.0"
32+
"@docusaurus/module-type-aliases": "3.9.2"
3333
},
3434
"browserslist": {
3535
"production": [

0 commit comments

Comments
 (0)