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

chore: convert to monorepo #1792

Merged
merged 4 commits into from
Jun 14, 2023
Merged

chore: convert to monorepo #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a82858
chore: convert to monorepo
achingbrain Jun 5, 2023
9565b49
Merge remote-tracking branch 'origin/master' into chore/convert-to-mo…
achingbrain Jun 14, 2023
32ea8e4
chore: add migration template to migrations dir
achingbrain Jun 14, 2023
905aa07
chore: restore missing file
achingbrain Jun 14, 2023
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
50 changes: 32 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,18 +159,34 @@ jobs:

release:
runs-on: ubuntu-latest
needs: [test-node, test-chrome, test-chrome-webworker, test-firefox, test-firefox-webworker, test-electron-main, test-electron-renderer, test-interop]
needs: [
maschad marked this conversation as resolved.
Show resolved Hide resolved
test-node,
test-chrome,
test-chrome-webworker,
test-firefox,
test-firefox-webworker,
test-electron-main,
test-electron-renderer,
test-interop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test-examples?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Examples are tested in a separate workflow file, I don't think you can depend on jobs defined in other files yet.

]
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
steps:
- uses: GoogleCloudPlatform/release-please-action@v2
id: release
with:
token: ${{ secrets.GITHUB_TOKEN }}
command: manifest
release-type: node
# breaking changes should rev the minor (remove after v1)
maschad marked this conversation as resolved.
Show resolved Hide resolved
bump-minor-pre-major: true
# features should rev the patch (remove after v1)
bump-patch-for-minor-pre-major: true
manifest-file: .release-please-manifest.json
config-file: .release-please.json
changelog-types: |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think this will be good addition to help enforce conventional commits but is it directly related to monorepo work? May be better for a follow up PR so that we can discuss the conventions.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this was copied from the js-ipfs workflow which uses release please to do gated monorepo releases.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha, and release please looks for Conventional Commit messages to automate our releases. I personally prefer this style of conventional commits but I was just making a suggestion for a discussion before going ahead with it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's not much to discuss - the commit style is the same as it was before, this is just config necessary to get release please to perform the gated releases as before.

[
{ "type": "feat", "section": "Features", "hidden": false },
{ "type": "fix", "section": "Bug Fixes", "hidden": false },
{ "type": "chore", "section": "Trivial Changes", "hidden": false },
{ "type": "docs", "section": "Documentation", "hidden": false },
{ "type": "deps", "section": "Dependencies", "hidden": false }
]
- uses: actions/checkout@v3
with:
fetch-depth: 0
Expand All @@ -179,23 +195,21 @@ jobs:
node-version: lts/*
registry-url: 'https://registry.npmjs.org'
- uses: ipfs/aegir/actions/cache-node-modules@master
- if: ${{ steps.release.outputs.release_created }}
name: Generate typedoc URLs
run: npm --if-present run docs -- --publish false
- if: ${{ steps.release.outputs.release_created }}
- uses: ipfs/aegir/actions/docker-login@master
with:
docker-token: ${{ secrets.DOCKER_TOKEN }}
docker-username: ${{ secrets.DOCKER_USERNAME }}
- if: ${{ steps.release.outputs.releases_created }}
name: Run release version
run: npm publish
run: |
git update-index --assume-unchanged packages/libp2p/src/version.ts
npm run --if-present release
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- if: ${{ steps.release.outputs.release_created }}
name: Publish docs
run: npm run --if-present docs
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- if: ${{ !steps.release.outputs.release_created }}
- if: ${{ !steps.release.outputs.releases_created }}
name: Run release rc
run: |
npm version `node -p -e "require('./package.json').version"`-`git rev-parse --short HEAD` --no-git-tag-version
npm publish --tag next
git update-index --assume-unchanged packages/libp2p/src/version.ts
npm run --if-present release:rc
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
3 changes: 3 additions & 0 deletions .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"packages/libp2p":"0.45.6"
}
9 changes: 9 additions & 0 deletions .release-please.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"plugins": ["node-workspace"],
"bump-minor-pre-major": true,
"bump-patch-for-minor-pre-major": true,
"group-pull-request-title-pattern": "chore: release ${component}",
"packages": {
"packages/libp2p": {}
}
}
43 changes: 0 additions & 43 deletions ISSUE_TEMPLATE.md
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions OKR.md
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions MIGRATION_TEMPLATE.md → doc/migrations/MIGRATION_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!--Specify versions for migration below-->
# Migrating to libp2p@__
# Migrating to libp2p@__ <!-- omit in toc -->

A migration guide for refactoring your application code from libp2p v__ to v__.

## Table of Contents
## Table of Contents <!-- omit in toc -->

- [API](#api)
- [Module Updates](#module-updates)
Expand Down Expand Up @@ -36,7 +36,7 @@ __Describe__
With this release you should update the following libp2p modules if you are relying on them:

<!--Specify module versions in JSON for migration below.
It's recommended to check package.json changes for this:
It's recommended to check package.json changes for this:
`git diff <release> <prev> -- package.json`
-->

Expand Down
2 changes: 1 addition & 1 deletion examples/auto-relay/dialer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { webSockets } from '@libp2p/websockets'
import { noise } from '@chainsafe/libp2p-noise'
import { mplex } from '@libp2p/mplex'
import { multiaddr } from '@multiformats/multiaddr'
import { yamux } from '@chainsafe/libp2p-yamux/dist/src'
import { yamux } from '@chainsafe/libp2p-yamux'
import { circuitRelayTransport } from 'libp2p/circuit-relay'
import { identifyService } from 'libp2p/identify'

Expand Down
2 changes: 1 addition & 1 deletion examples/auto-relay/listener.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { webSockets } from '@libp2p/websockets'
import { noise } from '@chainsafe/libp2p-noise'
import { mplex } from '@libp2p/mplex'
import { multiaddr } from '@multiformats/multiaddr'
import { yamux } from '@chainsafe/libp2p-yamux/dist/src'
import { yamux } from '@chainsafe/libp2p-yamux'
import { circuitRelayTransport } from 'libp2p/circuit-relay'
import { identifyService } from 'libp2p/identify'

Expand Down
2 changes: 1 addition & 1 deletion examples/connection-encryption/1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createLibp2p } from '../../dist/src/index.js'
import { createLibp2p } from '../../packages/libp2p/dist/src/index.js'
import { tcp } from '@libp2p/tcp'
import { mplex } from '@libp2p/mplex'
import { yamux } from '@chainsafe/libp2p-yamux'
Expand Down
2 changes: 1 addition & 1 deletion examples/delegated-routing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@chainsafe/libp2p-noise": "^12.0.0",
"ipfs-core": "^0.15.4",
"ipfs-http-client": "^58.0.1",
"libp2p": "file:../../",
"libp2p": "file:../../packages/libp2p",
"@libp2p/delegated-content-routing": "^4.0.0",
"@libp2p/delegated-peer-routing": "^4.0.0",
"@libp2p/kad-dht": "^9.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/libp2p-in-the-browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@libp2p/webrtc": "^1.2.0",
"@libp2p/websockets": "^6.0.1",
"@libp2p/webtransport": "^2.0.1",
"libp2p": "file:../../"
"libp2p": "file:../../packages/libp2p"
},
"devDependencies": {
"vite": "^2.8.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"execa": "^6.1.0",
"fs-extra": "^10.1.0",
"it-to-buffer": "^3.0.1",
"libp2p": "file:../",
"libp2p": "file:../packages/libp2p",
"p-defer": "^4.0.0",
"uint8arrays": "^4.0.0",
"which": "^2.0.1"
Expand Down
8 changes: 2 additions & 6 deletions interop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
FROM node:18

WORKDIR /app
COPY package.json .
COPY ./node_modules ./node_modules
COPY ./packages/libp2p ./packages/libp2p

WORKDIR /app/interop
COPY ./interop/node_modules ./node_modules

WORKDIR /app
COPY ./dist ./dist

WORKDIR /app/interop
COPY ./interop/dist ./dist

COPY ./interop/package.json .
COPY ./interop/.aegir.js .
COPY ./interop/relay.js .
Expand Down
2 changes: 1 addition & 1 deletion interop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@libp2p/webtransport": "^2.0.1",
"@multiformats/mafmt": "^12.1.2",
"@multiformats/multiaddr": "^12.1.3",
"libp2p": "../",
"libp2p": "../packages/libp2p",
"redis": "4.5.1"
},
"browser": {
Expand Down
Loading