Prithvi Shahi
c8cce59ef7
Create FUNDING.json ( #10734 )
...
Add FUNDING.json to participate in Optimism rPGF
Co-authored-by: Adin Schmahmann <adin.schmahmann@gmail.com>
2025-02-25 16:47:01 -05:00
Marcin Rataj
d6a5bc0b68
feat(AutoTLS): enabled by default with 1h RegistrationDelay ( #10724 )
...
Enables AutoTLS by default, but delays registration by 1h
if user did not explicitly set `AutoTLS.Enabled` to `true`
2025-02-25 22:25:58 +01:00
Guillaume Michel
65a9b59729
update kad-dht ( #10732 )
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
2025-02-25 10:28:51 +01:00
Andrew Gillis
26bb4ca276
Upgrade to Boxo v0.28.0 ( #10725 )
...
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
CodeQL / codeql (push) Has been cancelled
* Upgrade to Boxo v0.28.0
2025-02-24 16:54:14 -08:00
Andrew Gillis
8f07460ab3
Upgrade to go1.24 ( #10726 )
...
* Upgrade to go1.24
* fix test to look for new version info string
2025-02-24 14:46:20 -08:00
Andrew Gillis
2ca5637c4d
Replace go-random with random-data from go-test package ( #10731 )
...
* Replace go-random with random-data from go-test package
2025-02-24 13:42:39 -08:00
Andrew Gillis
96215c5cfa
Update to new go-test ( #10729 )
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
2025-02-21 17:11:58 -08:00
Andrew Gillis
56a053223e
Update go-test and use new random-files generator ( #10728 )
...
* Update go-test and use new random-files generator
Update sharness test for new random files.
* Update random file generation
2025-02-21 14:27:27 -08:00
Andrew Gillis
9a4fffa356
Upgrade to go-libp2p v0.40.0 ( #10727 )
2025-02-21 11:47:18 -08:00
Marcin Rataj
f00e115e1e
docs(readme): update docker section ( #10716 )
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
2025-02-18 21:59:53 +01:00
Andrew Gillis
eb53bbfa6c
Update go-ds-badger to v0.3.1 ( #10722 )
...
* Update go-ds-badger to v0.3.1
* update changelog
* update changelog
2025-02-18 16:50:35 +01:00
Andrew Gillis
e41dc120f7
Update pebble db to latest format by default ( #10720 )
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
* Update pebble db to latest format by default
If the pebble database format is not explicitly set in the config, then set it to the latest format version by default. This will ensure that the database format is sufficiently up-to-date to be compatible with a major version upgrade of pebble.
2025-02-17 15:32:53 -08:00
Russell Dempsey
40a7a388a4
fix: switch away from IPFS_LOG_LEVEL ( #10694 )
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
2025-02-14 18:25:31 +00:00
Marcin Rataj
04982f37f3
Merge pull request #10713 from ipfs/merge-release-v0.33.2
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
Merge release v0.33.2
2025-02-14 01:32:57 +01:00
Marcin Rataj
b61dd6bf80
Merge remote-tracking branch 'origin/master' into merge-release-v0.33.2
2025-02-14 01:30:03 +01:00
Marcin Rataj
d53eb2450c
fix: go-libp2p v0.39.1 ( #10711 )
...
https://github.com/libp2p/go-libp2p/releases/tag/v0.39.1
2025-02-13 23:47:36 +01:00
Marcin Rataj
ad1868a424
Merge pull request #10712 from ipfs/release-v0.33.2
...
Release v0.33.2
2025-02-13 23:44:43 +01:00
Marcin Rataj
ba31701b5d
docs: v0.33.2
2025-02-13 23:42:47 +01:00
Marcin Rataj
8942a17b92
fix: v0.33.2 with go-libp2p v0.38.3
...
https://github.com/libp2p/go-libp2p/releases/tag/v0.38.3
2025-02-13 21:58:59 +01:00
Andrew Gillis
d137d7a4ad
Remove unused TimeParts struct ( #10708 )
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
2025-02-11 14:35:19 -08:00
Marcin Rataj
e77a484aa8
fix(rpc): restore and reprecate bitswap reprovide ( #10699 )
...
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
https://github.com/ipfs/kubo/pull/10677 removed command without properly
deprecating it first, this restores it and marks as deprecated
we can remove it after at least 1 release with deprecation being
announced
2025-02-10 16:12:53 +01:00
Marcin Rataj
b387530d07
chore: go-libp2p v0.39.0 ( #10703 )
...
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
https://github.com/libp2p/go-libp2p/releases/tag/v0.39.0
2025-02-06 22:31:59 +01:00
Marcin Rataj
68c0879a4e
docs(release): update RELEASE_CHECKLIST.md after v0.33.1 ( #10697 )
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
2025-02-06 00:52:16 +01:00
Marcin Rataj
ad81ead4f4
docs: update min requirements ( #10687 )
...
https://docs.ipfs.tech/install/command-line/#system-requirements
states 6 GiB, updating readme to match that
2025-02-05 22:26:33 +01:00
Marcin Rataj
580ce695ec
Merge pull request #10698 from ipfs/merge-release-v0.33.1
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
Merge release v0.33.1
2025-02-04 22:57:45 +01:00
Marcin Rataj
aa72a12199
Merge branch 'master' into merge-release-v0.33.1
2025-02-04 22:55:57 +01:00
Marcin Rataj
9bfbc4e528
Merge pull request #10695 from ipfs/release-v0.33.1
...
Release v0.33.1
2025-02-04 20:34:27 +01:00
Marcin Rataj
30d5f8e9b9
docs(changelog): v0.33.1
2025-02-04 20:29:28 +01:00
Marcin Rataj
90f0bbbb15
chore: v0.33.1
2025-02-04 18:52:13 +01:00
Andrew Gillis
bddd4c60da
fix: boxo v0.27.4 ( #10692 )
...
https://github.com/ipfs/boxo/releases/tag/v0.27.4
Co-authored-by: Marcin Rataj <lidel@lidel.org>
(cherry picked from commit e727f097ca )
2025-02-04 18:51:21 +01:00
Andrew Gillis
e727f097ca
fix: boxo v0.27.4 ( #10692 )
...
https://github.com/ipfs/boxo/releases/tag/v0.27.4
Co-authored-by: Marcin Rataj <lidel@lidel.org>
2025-02-04 18:47:43 +01:00
Daniel Norman
70a8de4d1b
docs: add webrtc-direct fixes to 0.33 release changelog ( #10688 )
...
(cherry picked from commit e08c7cb31d )
2025-02-04 18:08:56 +01:00
Guillaume Michel
f5f1e59eab
fix: config help ( #10686 )
...
(cherry picked from commit 5d143a25c1 )
2025-02-04 18:08:31 +01:00
Sergey Gorbunov
032ceaf5d1
fix: Issue #9364 JSON config validation ( #10679 )
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
* Fix JSON config validation
* updated ReflectToMap
---------
Co-authored-by: galargh <piotr.galar@gmail.com>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
Co-authored-by: guillaumemichel <guillaume@michel.id>
2025-02-04 17:26:36 +01:00
dependabot[bot]
4bd79bdbca
chore(deps): bump actions/checkout from 3 to 4 ( #10691 )
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
Bumps [actions/checkout](https://github.com/actions/checkout ) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-04 00:10:55 -08:00
Marcin Rataj
6927f4fe54
docs: RELEASE_CHECKLIST.md update for 0.33 ( #10674 )
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Spell Check / spellcheck (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
2025-01-31 17:43:59 +01:00
Sergey Gorbunov
b35555978d
feat: Better self-service commands for DHT providing ( #10677 )
...
* Add lastRun, NextRun, move reprovide cmd to routing.
* acceleratedDHT logic
* changelog
* depend on latest boxo
---------
Co-authored-by: guillaumemichel <guillaume@michel.id>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
2025-01-31 16:33:11 +01:00
Daniel Norman
e08c7cb31d
docs: add webrtc-direct fixes to 0.33 release changelog ( #10688 )
2025-01-31 16:20:50 +01:00
Guillaume Michel
5d143a25c1
fix: config help ( #10686 )
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Spell Check / spellcheck (push) Waiting to run
2025-01-30 21:01:37 +01:00
dependabot[bot]
42394afcf0
chore(deps): bump codecov/codecov-action from 5.1.2 to 5.3.1 ( #10678 )
...
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action ) from 5.1.2 to 5.3.1.
- [Release notes](https://github.com/codecov/codecov-action/releases )
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md )
- [Commits](1e68e06f1d...13ce06bfc6 )
---
updated-dependencies:
- dependency-name: codecov/codecov-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-30 11:56:15 -08:00
youyyytrok
9adab295e0
feat: Add CI for Spell Checking ( #10637 )
...
* Create spellcheck.yml
* Create .codespell-ignore
---------
Co-authored-by: Marcin Rataj <lidel@lidel.org>
Co-authored-by: Guillaume Michel <guillaumemichel@users.noreply.github.com>
2025-01-30 17:50:51 +01:00
Marcin Rataj
dab91c858c
Merge pull request #10684 from ipfs/merge-release-v0.33.0
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
Merge release v0.33.0
2025-01-30 00:18:43 +01:00
Marcin Rataj
8d199128a1
chore: changelog for 0.34
2025-01-29 23:38:02 +01:00
Marcin Rataj
7edecb5874
Merge branch 'master' into merge-release-v0.33.0
2025-01-29 23:32:20 +01:00
Marcin Rataj
8b65738027
Merge pull request #10636 from ipfs/release-v0.33.0
...
Release 0.33.0
2025-01-29 21:56:06 +01:00
Marcin Rataj
b4b5d78f26
docs: 0.33.0
2025-01-29 21:42:45 +01:00
Piotr Galar
c5e9015cf0
test: fix the socat tests after the ubuntu 24.04 upgrade ( #10683 )
...
(cherry picked from commit 29bfcce4be )
2025-01-29 21:12:44 +01:00
Piotr Galar
29bfcce4be
test: fix the socat tests after the ubuntu 24.04 upgrade ( #10683 )
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
2025-01-29 21:11:41 +01:00
Marcin Rataj
3c9cc3f307
Revert "fix(ci): workaround for upload-rtifact@v3 depr."
...
CodeQL / codeql (push) Has been cancelled
Docker Build / docker-build (push) Has been cancelled
Gateway Conformance / gateway-conformance (push) Has been cancelled
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Has been cancelled
Go Build / go-build (push) Has been cancelled
Go Check / go-check (push) Has been cancelled
Go Lint / go-lint (push) Has been cancelled
Go Test / go-test (push) Has been cancelled
Interop / interop-prep (push) Has been cancelled
Sharness / sharness-test (push) Has been cancelled
Interop / helia-interop (push) Has been cancelled
Interop / ipfs-webui (push) Has been cancelled
This reverts commit a323bbf64c .
Solved by upstream fix:
https://github.com/ipfs/download-ipfs-distribution-action/pull/37
2025-01-24 17:37:03 +01:00
Marcin Rataj
a323bbf64c
fix(ci): workaround for upload-rtifact@v3 depr.
...
CodeQL / codeql (push) Waiting to run
Docker Build / docker-build (push) Waiting to run
Gateway Conformance / gateway-conformance (push) Waiting to run
Gateway Conformance / gateway-conformance-libp2p-experiment (push) Waiting to run
Go Build / go-build (push) Waiting to run
Go Check / go-check (push) Waiting to run
Go Lint / go-lint (push) Waiting to run
Go Test / go-test (push) Waiting to run
Interop / interop-prep (push) Waiting to run
Interop / helia-interop (push) Blocked by required conditions
Interop / ipfs-webui (push) Blocked by required conditions
Sharness / sharness-test (push) Waiting to run
provisional fix until https://github.com/ipfs/download-ipfs-distribution-action/pull/36/ is released
2025-01-23 21:58:25 +01:00