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.

Sign up for GitHub

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

feat: api support for ipfs-cluster@1.0 #1789

Merged
merged 3 commits into from
Apr 12, 2022
Merged

feat: api support for ipfs-cluster@1.0 #1789

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c05114
feat: api support for ipfs-cluster@1.0
olizilla Apr 8, 2022
9c4290c
chore: remove secrets condition from api ci workflow
olizilla Apr 8, 2022
bb7e144
ci(api): fix api workflow build errors (#1793)
gobengo Apr 11, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
DATABASE_CONNECTION: postgresql://postgres:postgres@localhost:5432/postgres
deploy-dev:
name: Deploy Dev
if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main' && secrets.CF_API_TOKEN != null
if: github.event_name == 'pull_request' && github.ref != 'refs/heads/main'
runs-on: ubuntu-latest
needs: test
steps:
Expand Down
2 changes: 1 addition & 1 deletion packages/api/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:

cluster0:
container_name: cluster0
image: ipfs/ipfs-cluster:latest
image: ipfs/ipfs-cluster:v1.0.0-rc4
depends_on:
- ipfs0
environment:
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@ipld/dag-cbor": "^6.0.13",
"@ipld/dag-pb": "^2.1.16",
"@magic-sdk/admin": "^1.3.0",
"@nftstorage/ipfs-cluster": "^4.0.0",
"@nftstorage/ipfs-cluster": "^5.0.1",
"@supabase/postgrest-js": "^0.34.1",
"ipfs-car": "^0.6.1",
"merge-options": "^3.0.4",
Expand Down
12 changes: 11 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2141,6 +2141,11 @@
resolved "https://registry.yarnpkg.com/@nftstorage/ipfs-cluster/-/ipfs-cluster-4.1.0.tgz#5b76cea95774d4d17fde3a692748982d6915bce2"
integrity sha512-Ld+dRAjEfbi5uK0Kb4zrD7fIV9W7mgx+wo4sjNhsuSe56qz4cOvP7tkMJLcqJ8KeQq7olffwYwtlZxGb0Svt/g==

"@nftstorage/ipfs-cluster@^5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@nftstorage/ipfs-cluster/-/ipfs-cluster-5.0.1.tgz#28655fd1bd35ac145b0acdd045f7db242713b3f4"
integrity sha512-e5+ICMllFgMRWIojh00vk/nk6SshDKQK/LDslg2249lHuBLEeIEajxiI8eM+9+w6DO14+o12IRjhtVIRk5rRaw==

"@noble/ed25519@^1.5.2":
version "1.6.0"
resolved "https://registry.yarnpkg.com/@noble/ed25519/-/ed25519-1.6.0.tgz#b55f7c9e532b478bf1d7c4f609e1f3a37850b583"
Expand Down Expand Up @@ -13942,7 +13947,12 @@ typedoc@^0.22.14:
minimatch "^5.0.1"
shiki "^0.10.1"

typescript@4.4.4, typescript@4.5.3:
typescript@4.4.4:
version "4.4.4"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==

typescript@4.5.3:
version "4.5.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.3.tgz#afaa858e68c7103317d89eb90c5d8906268d353c"
integrity sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==
Expand Down