Skip to content

Commit

Permalink
Merge pull request #10287 from ipfs/release-v0.26.0
Browse files Browse the repository at this point in the history
Release: v0.26.0 [skip changelog]
  • Loading branch information
hacdias authored Jan 22, 2024
2 parents 413a52d + dfec50d commit 096f510
Show file tree
Hide file tree
Showing 55 changed files with 1,243 additions and 2,139 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ jobs:
defaults:
run:
shell: bash
strategy:
matrix:
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
steps:
- uses: actions/setup-node@v3
with:
Expand All @@ -69,17 +66,19 @@ jobs:
- uses: actions/cache@v3
with:
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-${{ github.job }}-${{ matrix.repo-to-test-against }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-${{ github.job }}-${{ matrix.repo-to-test-against }}-
key: ${{ runner.os }}-${{ github.job }}-helia-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-${{ github.job }}-helia-
- run: sudo apt update
- run: sudo apt install -y libxkbcommon0 libxdamage1 libgbm1 libpango-1.0-0 libcairo2 # dependencies for playwright
- uses: actions/checkout@v4
with:
repository: ipfs/${{ matrix.repo-to-test-against }}
fetch-depth: 0
repository: ipfs/helia
fetch-depth: 1
path: interop
ref: 'ea5533c794df844c9fb9812e85e2f5e6af09efeb' # temporary while this commit is being released
- name: Checkout latest tag
run: |
exit 0 # temporary while ea5533c794df844c9fb9812e85e2f5e6af09efeb is released
export TAG="$(git describe --tags --abbrev=0)"
echo "Running tests against: $TAG"
git checkout "$TAG"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Kubo Changelogs

- [v0.26](docs/changelogs/v0.26.md)
- [v0.25](docs/changelogs/v0.25.md)
- [v0.24](docs/changelogs/v0.24.md)
- [v0.23](docs/changelogs/v0.23.md)
Expand Down
8 changes: 7 additions & 1 deletion client/rpc/pin.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ type pinRefKeyList struct {
type pin struct {
path path.ImmutablePath
typ string
name string
err error
}

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

func (p pin) Name() string {
return p.name
}

func (p pin) Type() string {
return p.typ
}
Expand All @@ -53,6 +58,7 @@ func (api *PinAPI) Add(ctx context.Context, p path.Path, opts ...caopts.PinAddOp

type pinLsObject struct {
Cid string
Name string
Type string
}

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

select {
case ch <- pin{typ: out.Type, path: path.FromCid(c)}:
case ch <- pin{typ: out.Type, name: out.Name, path: path.FromCid(c)}:
case <-ctx.Done():
return
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/daemon.go → cmd/ipfs/kubo/daemon.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/daemon_linux.go → cmd/ipfs/kubo/daemon_linux.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build linux
// +build linux

package main
package kubo

import (
daemon "github.com/coreos/go-systemd/v22/daemon"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/daemon_other.go → cmd/ipfs/kubo/daemon_other.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//go:build !linux
// +build !linux

package main
package kubo

func notifyReady() {}

Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/debug.go → cmd/ipfs/kubo/debug.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"net/http"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"context"
Expand Down
4 changes: 2 additions & 2 deletions cmd/ipfs/init.go → cmd/ipfs/kubo/init.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"context"
Expand Down Expand Up @@ -252,7 +252,7 @@ func initializeIpnsKeyspace(repoRoot string) error {

// pin recursively because this might already be pinned
// and doing a direct pin would throw an error in that case
err = nd.Pinning.Pin(ctx, emptyDir, true)
err = nd.Pinning.Pin(ctx, emptyDir, true, "")
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/ipfs.go → cmd/ipfs/kubo/ipfs.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
commands "github.com/ipfs/kubo/core/commands"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/pinmfs.go → cmd/ipfs/kubo/pinmfs.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ipfs/pinmfs_test.go → cmd/ipfs/kubo/pinmfs_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main
package kubo

import (
"context"
Expand Down
Loading

0 comments on commit 096f510

Please sign in to comment.