Skip to content

Commit 6634ec9

Browse files
authored
Merge branch 'master' into fix-fee-calculations
2 parents 46d76db + 47babbf commit 6634ec9

Some content is hidden

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

73 files changed

+2780
-492
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
> [!IMPORTANT]
22
>
3-
> 25.05 FREEZE MAY 12TH: Non-bugfix PRs not ready by this date will wait for 25.08.
3+
> 25.05 FREEZE MAY 05TH: Non-bugfix PRs not ready by this date will wait for 25.08.
44
>
5-
> RC1 is scheduled on _May 23rd_, RC2 on _May 26th_, ...
5+
> RC1 is scheduled on _May 12th_, RC2 on _May 16th_, ...
66
>
7-
> The final release is on MAY 29TH.
7+
> The final release is on MAY 20TH.
88
99

1010
## Checklist

.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,8 @@ jobs:
480480
poetry run pytest tests/ -vvv -n 2 ${PYTEST_OPTS} ${{ matrix.PYTEST_OPTS }}
481481
482482
update-docs-examples:
483-
name: Update examples in doc schemas
483+
name: Update examples in doc schemas (disabled temporarily!)
484+
if: false
484485
runs-on: ubuntu-22.04
485486
timeout-minutes: 30
486487
strategy:

Cargo.lock

Lines changed: 154 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ strip = "debuginfo"
44
[workspace]
55
resolver = "2"
66
members = [
7-
"cln-rpc",
8-
"cln-grpc",
9-
"plugins",
10-
"plugins/grpc-plugin",
11-
"plugins/rest-plugin"
7+
"cln-rpc",
8+
"cln-grpc",
9+
"plugins",
10+
"plugins/grpc-plugin",
11+
"plugins/rest-plugin",
12+
"plugins/lsps-plugin",
1213
]

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ RUN apt-get update -qq && \
9090
tclsh
9191

9292
ENV PATH="/root/.local/bin:$PATH" \
93-
PYTHON_VERSION=3
93+
PYTHON_VERSION=3 \
94+
POETRY_VERSION=2.0.1
9495
RUN curl -sSL https://install.python-poetry.org | python3 - && \
9596
poetry self add poetry-plugin-export
9697
RUN mkdir -p /root/.venvs && \

0 commit comments

Comments
 (0)