Skip to content

Commit 7e4257b

Browse files
committed
Merge branch 'master' into sho/multilet
2 parents baa2cef + 2ac0e0b commit 7e4257b

File tree

1,812 files changed

+14231
-3834
lines changed

Some content is hidden

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

1,812 files changed

+14231
-3834
lines changed

.github/workflows/changelog-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
files: '**/changelog.d/**'
2929

3030
- name: Enforce Label
31-
uses: actions/github-script@main
31+
uses: actions/github-script@v7.1.0
3232
if: github.event.pull_request.draft == false
3333
with:
3434
script: |

.github/workflows/docusaurus-site.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This workflow builds and deploys the Docusaurus site.
22
#
33
# On pull requests, this workflow builds the site and deploys a temporary preview
4-
# to gh-pages.
4+
# to gh-pages, but only if the relevant files have changed.
55
#
66
# On push to master or on workflow dispatch it deploys the site to:
77
# https://plutus.cardano.intersectmbo.org/docs
@@ -15,6 +15,9 @@ on:
1515
- master
1616
workflow_dispatch:
1717
pull_request:
18+
paths:
19+
- 'doc/docusaurus/**'
20+
- '.github/workflows/docusaurus-site.yml'
1821

1922
jobs:
2023
run:
@@ -49,14 +52,15 @@ jobs:
4952
PR_NUMBER="${{ github.event.pull_request.number }}"
5053
# These match the URL expected by rossjrw/[email protected]:
5154
export DOCUSAURUS_URL="https://plutus.cardano.intersectmbo.org"
52-
export DOCUSAURUS_BASE_URL="/pr-preview/pr-${PR_NUMBER}"
55+
export DOCUSAURUS_BASE_URL="/pr-preview/docs/pr-${PR_NUMBER}"
5356
nix develop --no-warn-dirty --accept-flake-config --command bash -c 'yarn && yarn build'
5457
5558
- name: Deploy Preview Site
56-
if: github.event_name == 'pull_request' && github.event.action != 'closed'
59+
if: github.event_name == 'pull_request'
5760
uses: rossjrw/[email protected]
5861
with:
5962
source-dir: doc/docusaurus/build
63+
umbrella-dir: pr-preview/docs
6064

6165

6266

.github/workflows/haddock-site.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ jobs:
7474

7575
- name: Delete Oldest Build
7676
run: |
77-
# Delete the oldest haddock build if there are more than 11 builds.
78-
if [[ $(ls -1A haddock | wc -l) -gt 11 ]]; then
77+
# Delete the oldest haddock build if there are more than 10 builds.
78+
if [[ $(ls -1A haddock | wc -l) -gt 10 ]]; then
7979
OLDEST_BUILD=$(ls -1A haddock | sort | head -n 1)
8080
rm -rf haddock/$OLDEST_BUILD
8181

.github/workflows/manual-benchmark.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fetch-depth: 5
3434

3535
- name: React With Rocket
36-
uses: actions/github-script@main
36+
uses: actions/github-script@v7.1.0
3737
with:
3838
script: |
3939
github.rest.reactions.createForIssueComment({
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Extract Benchmark Name
4747
id: extract-benchmark
48-
uses: actions/github-script@main
48+
uses: actions/github-script@v7.1.0
4949
with:
5050
script: |
5151
const regex = /^\/benchmark\s*([^\s]*)\s*(ghc96|ghc98|ghc910)?\s*$/;
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Extract Branch Name
6262
id: extract-branch
63-
uses: actions/github-script@main
63+
uses: actions/github-script@v7.1.0
6464
with:
6565
script: |
6666
async function isPullRequest() {
@@ -104,7 +104,7 @@ jobs:
104104
}
105105
106106
- name: Publish GH Action Link
107-
uses: actions/github-script@main
107+
uses: actions/github-script@v7.1.0
108108
with:
109109
script: |
110110
async function getJobUrl() {
@@ -133,7 +133,7 @@ jobs:
133133

134134

135135
- name: Publish Results
136-
uses: actions/github-script@main
136+
uses: actions/github-script@v7.1.0
137137
with:
138138
script: |
139139
const fs = require("fs");

.github/workflows/metatheory-site.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@ jobs:
5757
with:
5858
ref: ${{ inputs.ref || github.ref_name }}
5959

60+
- name: Delete Oldest Build
61+
run: |
62+
# Delete the oldest metatheory build if there are more than 10 builds.
63+
if [[ $(ls -1A metatheory | wc -l) -gt 10 ]]; then
64+
OLDEST_BUILD=$(ls -1A metatheory | sort | head -n 1)
65+
rm -rf metatheory/$OLDEST_BUILD
66+
67+
git config user.name "github-actions[bot]"
68+
git config user.email "github-actions[bot]@users.noreply.github.com"
69+
git rm -r --cached metatheory/$OLDEST_BUILD || true
70+
git commit -am "Delete oldest metatheory build $OLDEST_BUILD"
71+
git push origin gh-pages
72+
fi
73+
6074
- name: Build Site
6175
run: |
6276
nix build --accept-flake-config .#metatheory-site

.github/workflows/papers-and-specs.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# This workflow builds and deploys various papers.
22
#
3+
# On pull requests, this workflow builds the papers and deploys a temporary preview
4+
# to gh-pages, but only if the relevant files have changed.
5+
#
36
# This workflow runs on all push to master and can also be triggered manually.
47
# It deploys the artifacts to: https://plutus.cardano.intersectmbo.org/resources
58

@@ -10,6 +13,10 @@ on:
1013
push:
1114
branches:
1215
- master
16+
pull_request:
17+
paths:
18+
- 'doc'
19+
- '!doc/docusaurus/**'
1320

1421
jobs:
1522
deploy:
@@ -42,8 +49,16 @@ jobs:
4249
done
4350
4451
- name: Publish Papers
52+
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
4553
uses: JamesIves/[email protected]
4654
with:
4755
folder: _resources
4856
target-folder: resources
49-
single-commit: true
57+
single-commit: true
58+
59+
- name: Publish Preview Papers
60+
if: github.event_name == 'pull_request'
61+
uses: rossjrw/[email protected]
62+
with:
63+
source-dir: _resources
64+
umbrella-dir: pr-preview/resources

.github/workflows/slack-message-broker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: [ubuntu-latest]
3030
steps:
3131
- name: Prepare Slack Message
32-
uses: actions/github-script@main
32+
uses: actions/github-script@v7.1.0
3333
id: prepare-slack-message
3434

3535
with:

.github/workflows/triage-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
issues: write
1616
steps:
1717
- name: Add Label
18-
uses: actions/github-script@main
18+
uses: actions/github-script@v7.1.0
1919
with:
2020
script: |
2121
const INTERNAL_LABELS = ["Internal", "status: triaged"];

cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
1414
-- update either of these.
1515
index-state:
1616
-- Bump both the following dates if you need newer packages from Hackage
17-
, hackage.haskell.org 2025-07-16T09:24:19Z
17+
, hackage.haskell.org 2025-09-21T21:31:06Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2025-08-27T16:08:15Z
19+
, cardano-haskell-packages 2025-09-18T12:21:32Z
2020

2121
packages: cardano-constitution
2222
plutus-benchmark

cardano-constitution/cardano-constitution.cabal

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: cardano-constitution
3-
version: 1.53.0.0
3+
version: 1.54.0.0
44
license: Apache-2.0
55
license-files:
66
LICENSE
@@ -86,10 +86,10 @@ library
8686
, base >=4.9 && <5
8787
, containers
8888
, filepath
89-
, plutus-core ^>=1.53
90-
, plutus-ledger-api ^>=1.53
91-
, plutus-tx ^>=1.53
92-
, plutus-tx-plugin ^>=1.53
89+
, plutus-core ^>=1.54
90+
, plutus-ledger-api ^>=1.54
91+
, plutus-tx ^>=1.54
92+
, plutus-tx-plugin ^>=1.54
9393
, regex-tdfa
9494
, safe
9595
, template-haskell
@@ -132,10 +132,10 @@ test-suite cardano-constitution-test
132132
, containers
133133
, directory
134134
, filepath
135-
, plutus-core ^>=1.53
135+
, plutus-core ^>=1.54
136136
, plutus-core:plutus-core-testlib
137-
, plutus-ledger-api ^>=1.53
138-
, plutus-tx ^>=1.53
137+
, plutus-ledger-api ^>=1.54
138+
, plutus-tx ^>=1.54
139139
, QuickCheck
140140
, serialise
141141
, tasty
@@ -152,4 +152,4 @@ executable create-json-envelope
152152
build-depends:
153153
, base
154154
, cardano-constitution
155-
, plutus-ledger-api ^>=1.53
155+
, plutus-ledger-api ^>=1.54

0 commit comments

Comments
 (0)