Skip to content

Commit 3e54b4d

Browse files
authored
Merge branch 'master' into king-11/remove-rustfmt
2 parents ea9c76a + 7b1c487 commit 3e54b4d

2,257 files changed

Lines changed: 7730 additions & 5246 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
Dockerfile
22
contrib/docker/Dockerfile.*
33
target
4+
config.vars
5+
release/
6+
.venv/

.github/workflows/pypi.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ jobs:
6767
- name: Install uv
6868
uses: astral-sh/setup-uv@v5
6969

70+
- name: Update pyln versions
71+
id: update-versions
72+
run: |
73+
export VERSION=$(git describe --tags --abbrev=0)
74+
echo "Pyln VERSION: $VERSION"
75+
make update-pyln-versions NEW_VERSION=$VERSION
76+
7077
- name: Publish distribution 📦 to Test PyPI
7178
if: github.repository == 'ElementsProject/lightning' && steps.set-values.outputs.DISTLOCATION == 'test'
7279
env:
@@ -84,10 +91,6 @@ jobs:
8491
WORKDIR: ${{ matrix.WORKDIR }}
8592
run: |
8693
echo "UV VERSION PUBLISH: $(uv --version)"
87-
cd ${{ env.WORKDIR }}
88-
export VERSION=$(git describe --tags --abbrev=0)
8994
echo "Pyln VERSION: $VERSION"
90-
make update-pyln-versions NEW_VERSION=$VERSION
91-
cd /github/workspace
9295
uv build --package ${{ matrix.PACKAGE }}
9396
uv publish

.github/workflows/readme-rpc-sync.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
run: |
3030
python -m pip install requests mako grpcio-tools
3131
32+
- name: Install uv
33+
uses: astral-sh/setup-uv@v5
34+
3235
- name: Install dependencies
3336
run: bash -x .github/scripts/setup.sh
3437

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
sudo apt-get install -y lowdown
149149
./configure
150150
tools/build-release.sh --without-zip sign
151-
mv release/SHA256SUMS.asc${{ steps.gpg.outputs.keyid }} release/SHA256SUMS.asc
151+
mv release/SHA256SUMS.${{ env.version }}.asc${{ steps.gpg.outputs.keyid }} release/SHA256SUMS.${{ env.version }}.asc
152152
153153
- name: Upload signed artifact
154154
uses: actions/upload-artifact@v4

.msggen.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,6 +3146,8 @@
31463146
"Offer.description": 2,
31473147
"Offer.issuer": 3,
31483148
"Offer.label": 4,
3149+
"Offer.optional_recurrence": 14,
3150+
"Offer.proportional_amount": 13,
31493151
"Offer.quantity_max": 5,
31503152
"Offer.recurrence": 7,
31513153
"Offer.recurrence_base": 8,
@@ -11338,6 +11340,14 @@
1133811340
"added": "pre-v0.10.1",
1133911341
"deprecated": null
1134011342
},
11343+
"Offer.optional_recurrence": {
11344+
"added": "v25.09",
11345+
"deprecated": null
11346+
},
11347+
"Offer.proportional_amount": {
11348+
"added": "v25.09",
11349+
"deprecated": null
11350+
},
1134111351
"Offer.quantity_max": {
1134211352
"added": "pre-v0.10.1",
1134311353
"deprecated": null

Cargo.lock

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

0 commit comments

Comments
 (0)