Skip to content

Commit 096f510

Browse files
authored
Merge pull request #10287 from ipfs/release-v0.26.0
Release: v0.26.0 [skip changelog]
2 parents 413a52d + dfec50d commit 096f510

Some content is hidden

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

55 files changed

+1243
-2139
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ jobs:
5252
defaults:
5353
run:
5454
shell: bash
55-
strategy:
56-
matrix:
57-
repo-to-test-against: ["helia", "helia-ipns", "helia-unixfs", "helia-car", "helia-dag-json", "helia-dag-cbor", "helia-json", "helia-mfs"] # this needs to be manually kept in sync as new helia tests are written
5855
steps:
5956
- uses: actions/setup-node@v3
6057
with:
@@ -69,17 +66,19 @@ jobs:
6966
- uses: actions/cache@v3
7067
with:
7168
path: ${{ steps.npm-cache-dir.outputs.dir }}
72-
key: ${{ runner.os }}-${{ github.job }}-${{ matrix.repo-to-test-against }}-${{ hashFiles('**/package-lock.json') }}
73-
restore-keys: ${{ runner.os }}-${{ github.job }}-${{ matrix.repo-to-test-against }}-
69+
key: ${{ runner.os }}-${{ github.job }}-helia-${{ hashFiles('**/package-lock.json') }}
70+
restore-keys: ${{ runner.os }}-${{ github.job }}-helia-
7471
- run: sudo apt update
7572
- run: sudo apt install -y libxkbcommon0 libxdamage1 libgbm1 libpango-1.0-0 libcairo2 # dependencies for playwright
7673
- uses: actions/checkout@v4
7774
with:
78-
repository: ipfs/${{ matrix.repo-to-test-against }}
79-
fetch-depth: 0
75+
repository: ipfs/helia
76+
fetch-depth: 1
8077
path: interop
78+
ref: 'ea5533c794df844c9fb9812e85e2f5e6af09efeb' # temporary while this commit is being released
8179
- name: Checkout latest tag
8280
run: |
81+
exit 0 # temporary while ea5533c794df844c9fb9812e85e2f5e6af09efeb is released
8382
export TAG="$(git describe --tags --abbrev=0)"
8483
echo "Running tests against: $TAG"
8584
git checkout "$TAG"

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Kubo Changelogs
22

3+
- [v0.26](docs/changelogs/v0.26.md)
34
- [v0.25](docs/changelogs/v0.25.md)
45
- [v0.24](docs/changelogs/v0.24.md)
56
- [v0.23](docs/changelogs/v0.23.md)

client/rpc/pin.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ type pinRefKeyList struct {
2626
type pin struct {
2727
path path.ImmutablePath
2828
typ string
29+
name string
2930
err error
3031
}
3132

@@ -37,6 +38,10 @@ func (p pin) Path() path.ImmutablePath {
3738
return p.path
3839
}
3940

41+
func (p pin) Name() string {
42+
return p.name
43+
}
44+
4045
func (p pin) Type() string {
4146
return p.typ
4247
}
@@ -53,6 +58,7 @@ func (api *PinAPI) Add(ctx context.Context, p path.Path, opts ...caopts.PinAddOp
5358

5459
type pinLsObject struct {
5560
Cid string
61+
Name string
5662
Type string
5763
}
5864

@@ -102,7 +108,7 @@ func (api *PinAPI) Ls(ctx context.Context, opts ...caopts.PinLsOption) (<-chan i
102108
}
103109

104110
select {
105-
case ch <- pin{typ: out.Type, path: path.FromCid(c)}:
111+
case ch <- pin{typ: out.Type, name: out.Name, path: path.FromCid(c)}:
106112
case <-ctx.Done():
107113
return
108114
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main
1+
package kubo
22

33
import (
44
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main
1+
package kubo
22

33
import (
44
"errors"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//go:build linux
22
// +build linux
33

4-
package main
4+
package kubo
55

66
import (
77
daemon "github.com/coreos/go-systemd/v22/daemon"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//go:build !linux
22
// +build !linux
33

4-
package main
4+
package kubo
55

66
func notifyReady() {}
77

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main
1+
package kubo
22

33
import (
44
"net/http"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main
1+
package kubo
22

33
import (
44
"context"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package main
1+
package kubo
22

33
import (
44
"context"
@@ -252,7 +252,7 @@ func initializeIpnsKeyspace(repoRoot string) error {
252252

253253
// pin recursively because this might already be pinned
254254
// and doing a direct pin would throw an error in that case
255-
err = nd.Pinning.Pin(ctx, emptyDir, true)
255+
err = nd.Pinning.Pin(ctx, emptyDir, true, "")
256256
if err != nil {
257257
return err
258258
}

0 commit comments

Comments
 (0)