Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: follow-up after repository rename #9098

Merged
merged 7 commits into from
Jul 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions .circleci/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ aliases:
restore_gomod: &restore_gomod
restore_cache:
keys:
- v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/go-ipfs/go.sum" }}-{{ .Environment.CIRCLE_JOB }}
- v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/go-ipfs/go.sum" }}-
- v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/kubo/go.sum" }}-{{ .Environment.CIRCLE_JOB }}
- v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/kubo/go.sum" }}-
- v5-dep-{{ .Branch }}-
- v5-dep-master-
store_gomod: &store_gomod
save_cache:
key: v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/go-ipfs/go.sum" }}-{{ .Environment.CIRCLE_JOB }}
key: v5-dep-{{ .Branch }}-{{ checksum "~/ipfs/kubo/go.sum" }}-{{ .Environment.CIRCLE_JOB }}
paths:
- ~/go/pkg/mod
- ~/.cache/go-build/
Expand All @@ -38,7 +38,7 @@ executors:
golang:
docker:
- image: cimg/go:1.18.3
working_directory: ~/ipfs/go-ipfs
working_directory: ~/ipfs/kubo
environment:
<<: *default_environment
TEST_NO_DOCKER: 1
Expand All @@ -47,13 +47,13 @@ executors:
node:
docker:
- image: circleci/node:14
working_directory: ~/ipfs/go-ipfs
working_directory: ~/ipfs/kubo
environment:
<<: *default_environment
node-browsers:
docker:
- image: circleci/node:14-browsers
working_directory: ~/ipfs/go-ipfs
working_directory: ~/ipfs/kubo
environment:
<<: *default_environment
NO_SANDBOX: true
Expand All @@ -64,7 +64,7 @@ executors:
docker:
- image: cimg/go:1.18.3
environment:
IMAGE_NAME: ipfs/go-ipfs
IMAGE_NAME: ipfs/kubo
WIP_IMAGE_TAG: wip

jobs:
Expand Down Expand Up @@ -108,21 +108,21 @@ jobs:
command: bash <(curl -s https://codecov.io/bash) -cF unittests -X search -f coverage/unit_tests.coverprofile
- run:
command: |
# we want to first test with the go-ipfs in the go.mod file
# we want to first test with the kubo version in the go.mod file
go test -v ./...

# we also want to test the examples against the current version of go-ipfs
# we also want to test the examples against the current version of kubo
# however, that version might be in a fork so we need to replace the dependency

# backup the go.mod and go.sum files to restore them after we run the tests
cp go.mod go.mod.bak
cp go.sum go.sum.bak

# make sure the examples run against the current version of go-ipfs
# make sure the examples run against the current version of kubo
go mod edit -replace github.com/ipfs/kubo=./../../..
go mod tidy

# use the internal config package when we test the current version of go-ipfs
# use the internal config package when we test the current version of kubo
sed -i.bak 's;"github.com/ipfs/go-ipfs-config";"github.com/ipfs/kubo/config";' ./main.go

go test -v ./...
Expand All @@ -133,7 +133,7 @@ jobs:

# restore the main.go to its original state
mv main.go.bak main.go
working_directory: ~/ipfs/go-ipfs/docs/examples/go-ipfs-as-a-library
working_directory: ~/ipfs/kubo/docs/examples/go-ipfs-as-a-library

- run:
when: always
Expand All @@ -152,7 +152,7 @@ jobs:
machine:
image: ubuntu-2004:202010-01
resource_class: << pipeline.parameters.resource_class >>
working_directory: ~/ipfs/go-ipfs
working_directory: ~/ipfs/kubo
environment:
<<: *default_environment
TEST_NO_DOCKER: 0
Expand Down Expand Up @@ -248,14 +248,14 @@ jobs:
npm install ipfs@^0.61.0
npm install ipfs-interop@^8.0.10
npm install [email protected]
working_directory: ~/ipfs/go-ipfs/interop
working_directory: ~/ipfs/kubo/interop
- run:
name: Running tests
command: |
mkdir -p /tmp/test-results/interop/
export MOCHA_FILE="$(mktemp /tmp/test-results/interop/unit.XXXXXX.xml)"
npx ipfs-interop -- -t node -f $(sed -n -e "s|^import '\(.*\)'$|test/\1|p" node_modules/ipfs-interop/test/node.js | circleci tests split --split-by=timings) -- --reporter mocha-circleci-reporter
working_directory: ~/ipfs/go-ipfs/interop
working_directory: ~/ipfs/kubo/interop
environment:
LIBP2P_TCP_REUSEPORT: false
LIBP2P_ALLOW_WEAK_RSA_KEYS: 1
Expand All @@ -265,7 +265,7 @@ jobs:
- save_cache:
key: v1-interop-{{ .Branch }}-{{ .Revision }}
paths:
- ~/ipfs/go-ipfs/interop/node_modules
- ~/ipfs/kubo/interop/node_modules
go-ipfs-api:
executor: golang
steps:
Expand All @@ -290,13 +290,13 @@ jobs:
done
- restore_cache:
keys:
- v1-go-api-{{ checksum "~/ipfs/go-ipfs/go-ipfs-api/go.sum" }}
- v1-go-api-{{ checksum "~/ipfs/kubo/go-ipfs-api/go.sum" }}
- v1-go-api-
- run:
command: go test -count=1 -v ./...
working_directory: ~/ipfs/go-ipfs/go-ipfs-api
working_directory: ~/ipfs/kubo/go-ipfs-api
- save_cache:
key: v1-go-api-{{ checksum "~/ipfs/go-ipfs/go-ipfs-api/go.sum" }}
key: v1-go-api-{{ checksum "~/ipfs/kubo/go-ipfs-api/go.sum" }}
paths:
- ~/go/pkg/mod
- ~/.cache/go-build/
Expand All @@ -316,16 +316,16 @@ jobs:
git -C go-ipfs-http-client log -1
- restore_cache:
keys:
- v1-http-client-{{ checksum "~/ipfs/go-ipfs/go-ipfs-http-client/go.sum" }}
- v1-http-client-{{ checksum "~/ipfs/kubo/go-ipfs-http-client/go.sum" }}
- v1-http-client-
- run:
name: go test -count=1 -v ./...
command: |
export PATH=/tmp/circleci-workspace/bin:$PATH
go test -count=1 -v ./...
working_directory: ~/ipfs/go-ipfs/go-ipfs-http-client
working_directory: ~/ipfs/kubo/go-ipfs-http-client
- save_cache:
key: v1-http-client-{{ checksum "~/ipfs/go-ipfs/go-ipfs-http-client/go.sum" }}
key: v1-http-client-{{ checksum "~/ipfs/kubo/go-ipfs-http-client/go.sum" }}
paths:
- ~/go/pkg/mod
- ~/.cache/go-build/
Expand All @@ -338,36 +338,36 @@ jobs:
- run:
name: Cloning
command: |
git clone https://github.com/ipfs-shipyard/ipfs-webui.git
git clone https://github.com/ipfs/ipfs-webui.git
git -C ipfs-webui log -1
- restore_cache:
keys:
- v1-ipfs-webui-{{ checksum "~/ipfs/go-ipfs/ipfs-webui/package-lock.json" }}
- v1-ipfs-webui-{{ checksum "~/ipfs/kubo/ipfs-webui/package-lock.json" }}
- v1-ipfs-webui-
- run:
name: Installing dependencies
command: |
npm install
npx playwright install
working_directory: ~/ipfs/go-ipfs/ipfs-webui
working_directory: ~/ipfs/kubo/ipfs-webui
- run:
name: Running upstream tests (finish early if they fail)
command: |
npm test || circleci-agent step halt
working_directory: ~/ipfs/go-ipfs/ipfs-webui
working_directory: ~/ipfs/kubo/ipfs-webui
- run:
name: Running tests with go-ipfs built from current commit
name: Running tests with kubo built from current commit
command: npm test
working_directory: ~/ipfs/go-ipfs/ipfs-webui
working_directory: ~/ipfs/kubo/ipfs-webui
environment:
IPFS_GO_EXEC: /tmp/circleci-workspace/bin/ipfs
- save_cache:
key: v1-ipfs-webui-{{ checksum "~/ipfs/go-ipfs/ipfs-webui/package-lock.json" }}
key: v1-ipfs-webui-{{ checksum "~/ipfs/kubo/ipfs-webui/package-lock.json" }}
paths:
- ~/.cache/ms-playwright
- ~/ipfs/go-ipfs/ipfs-webui/node_modules
- ~/ipfs/kubo/ipfs-webui/node_modules
# We only run build as a test here. DockerHub images are built and published
# by GitHub Action now: https://github.com/ipfs/go-ipfs/pull/8467
# by GitHub Action now: https://github.com/ipfs/kubo/pull/8467
docker-build:
executor: dockerizer
steps:
Expand Down
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: Bug Report
description: Report a bug in go-ipfs.
description: Report a bug in Kubo.
labels:
- kind/bug
- need/triage
body:
- type: markdown
attributes:
value: |
- Make sure you are running the [latest version of go-ipfs][releases] before reporting an issue.
- If you have an enhancement or feature request for go-ipfs, please select [a different option][issues].
- Make sure you are running the [latest version of Kubo][releases] before reporting an issue.
- If you have an enhancement or feature request for Kubo, please select [a different option][issues].
- Please report possible security issues by email to [email protected]

[issues]: https://github.com/ipfs/go-ipfs/issues/new/choose
[releases]: https://github.com/ipfs/go-ipfs/releases
[issues]: https://github.com/ipfs/kubo/issues/new/choose
[releases]: https://github.com/ipfs/kubo/releases
- type: checkboxes
attributes:
label: Checklist
description: Please verify that you've followed these steps
options:
- label: This is a bug report, not a question. Ask questions on [discuss.ipfs.io](https://discuss.ipfs.io).
required: true
- label: I have searched on the [issue tracker](https://github.com/ipfs/go-ipfs/issues?q=is%3Aissue) for my bug.
- label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my bug.
required: true
- label: I am running the latest [go-ipfs version](https://dist.ipfs.io/#go-ipfs) or have an issue updating.
- label: I am running the latest [kubo version](https://dist.ipfs.io/#kubo) or have an issue updating.
required: true
- type: dropdown
id: install
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ contact_links:
- name: Getting Help on IPFS
url: https://ipfs.io/help
about: All information about how and where to get help on IPFS.
- name: Go-ipfs configuration reference
url: https://github.com/ipfs/go-ipfs/blob/master/docs/config.md#readme
- name: Kubo configuration reference
url: https://github.com/ipfs/kubo/blob/master/docs/config.md#readme
about: Documentation on the different configuration settings
- name: Go-ipfs experimental features docs
url: https://github.com/ipfs/go-ipfs/blob/master/docs/experimental-features.md#readme
- name: Kubo experimental features docs
url: https://github.com/ipfs/kubo/blob/master/docs/experimental-features.md#readme
about: Documentation on Private Networks, Filestore and other experimental features.
- name: RPC API Reference
url: https://docs.ipfs.io/reference/http/api/
about: Documentation of all go-ipfs RPC API endpoints.
about: Documentation of all Kubo RPC API endpoints.
- name: IPFS Official Forum
url: https://discuss.ipfs.io
about: Please post general questions, support requests, and discussions here.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/doc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Documentation Issue
description: Report missing, erroneous docs, broken links or propose new go-ipfs docs.
description: Report missing, erroneous docs, broken links or propose new Kubo docs.
labels:
- topic/docs-ipfs
- need/triage
Expand All @@ -15,7 +15,7 @@ body:
options:
- label: I am reporting a documentation issue in this repo, not https://docs.ipfs.io.
required: true
- label: I have searched on the [issue tracker](https://github.com/ipfs/go-ipfs/issues?q=is%3Aissue) for my issue.
- label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my issue.
required: true
- type: input
attributes:
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: Enhancement
description: Suggest an improvement to an existing go-ipfs feature.
description: Suggest an improvement to an existing kubo feature.
labels:
- kind/enhancement
body:
- type: markdown
attributes:
value: |
Suggest an enhancement to go-ipfs (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
Suggest an enhancement to Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).

Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.

If you have an idea you'd like to discuss, please open a new thread on [the forum](https://discuss.ipfs.io).

**Example:**

> Reduce memory usage of `ipfs cat` (specific) by buffering less in ... (actionable). This would let me run go-ipfs on my Raspberry Pi (motivated).
> Reduce memory usage of `ipfs cat` (specific) by buffering less in ... (actionable). This would let me run Kubo on my Raspberry Pi (motivated).
- type: checkboxes
attributes:
label: Checklist
Expand All @@ -24,7 +24,7 @@ body:
required: true
- label: I am not suggesting a protocol enhancement.
required: true
- label: I have searched on the [issue tracker](https://github.com/ipfs/go-ipfs/issues?q=is%3Aissue) for my issue.
- label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my issue.
required: true
- type: textarea
attributes:
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Feature
description: Suggest a new feature in go-ipfs.
description: Suggest a new feature in Kubo.
labels:
- kind/feature
body:
- type: markdown
attributes:
value: |
Suggest a new feature in go-ipfs (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).
Suggest a new feature in Kubo (the program). If you'd like to suggest an improvement to the IPFS protocol, please discuss it on [the forum](https://discuss.ipfs.io).

Issues in this repo must be specific, actionable, and well motivated. They should be starting points for _building_ new features, not brainstorming ideas.

Expand All @@ -25,7 +25,7 @@ body:
required: true
- label: I am not suggesting a protocol enhancement.
required: true
- label: I have searched on the [issue tracker](https://github.com/ipfs/go-ipfs/issues?q=is%3Aissue) for my issue.
- label: I have searched on the [issue tracker](https://github.com/ipfs/kubo/issues?q=is%3Aissue) for my issue.
required: true
- type: textarea
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
analyze:
if: github.repository == 'ipfs/go-ipfs' || github.event_name == 'workflow_dispatch'
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
name: Analyze
runs-on: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
push_to_registry:
if: github.repository == 'ipfs/go-ipfs' || github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sync-release-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

jobs:
sync-github-and-dist-ipfs-io:
if: github.repository == 'ipfs/go-ipfs' || github.event_name == 'workflow_dispatch'
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
runs-on: "ubuntu-latest"
steps:
- uses: ipfs/download-ipfs-distribution-action@v1
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
}

// fetch asset info from dist.ipfs.io
p = '/ipns/dist.ipfs.io/go-ipfs/' + release.tag_name
p = '/ipns/dist.ipfs.io/kubo/' + release.tag_name
let stdout = ''
const options = {}
options.listeners = {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testground-on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
testground:
if: github.repository == 'ipfs/go-ipfs' || github.event_name == 'workflow_dispatch'
if: github.repository == 'ipfs/kubo' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
name: ${{ matrix.composition_file }}
strategy:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

> the oldest IPFS implementation, previously known as "go-ipfs"

![kubo](https://user-images.githubusercontent.com/157609/167471494-dee3a355-b551-4fbf-98e0-2eb76e867b48.png)
![kubo, an IPFS node in Go](https://ipfs.io/ipfs/bafykbzacecaesuqmivkauix25v6i6xxxsvsrtxknhgb5zak3xxsg2nb4dhs2u/ipfs.go.png)

[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square&cacheSeconds=3600)](https://protocol.ai)
[![GoDoc](https://img.shields.io/badge/godoc-reference-5272B4.svg?style=flat-square&cacheSeconds=3600)](https://godoc.org/github.com/ipfs/kubo)
Expand Down
Loading