From 9dee9eed4aa6042254ccc4e2d4743c7781eabe71 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 10 Jan 2023 12:22:53 +0000 Subject: [PATCH] fix: use aegir to publish RCs Use the new `release-rc` command in aegir to publish release candidates instead of lerna. --- .github/workflows/test.yml | 2 -- lerna.json | 18 ------------------ package.json | 11 ++++------- packages/interface-ipfs-core/package.json | 2 +- packages/ipfs-cli/package.json | 2 +- packages/ipfs-client/package.json | 2 +- packages/ipfs-core-config/package.json | 2 +- packages/ipfs-core-types/package.json | 2 +- packages/ipfs-core-utils/package.json | 2 +- packages/ipfs-core/package.json | 2 +- packages/ipfs-daemon/package.json | 2 +- packages/ipfs-grpc-client/package.json | 2 +- packages/ipfs-grpc-protocol/package.json | 2 +- packages/ipfs-grpc-server/package.json | 2 +- packages/ipfs-http-client/package.json | 2 +- packages/ipfs-http-gateway/package.json | 2 +- packages/ipfs-http-response/package.json | 2 +- packages/ipfs-http-server/package.json | 2 +- packages/ipfs-message-port-client/package.json | 2 +- .../ipfs-message-port-protocol/package.json | 2 +- packages/ipfs-message-port-server/package.json | 2 +- packages/ipfs/package.json | 2 +- 22 files changed, 23 insertions(+), 46 deletions(-) delete mode 100644 lerna.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8db52dbd39..3a5343767c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -262,8 +262,6 @@ jobs: - if: ${{ !steps.release.outputs.releases_created }} name: Run release rc run: | - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" git update-index --assume-unchanged packages/ipfs-core/src/version.js packages/ipfs-http-server/src/version.js packages/ipfs/src/package.js npm run --if-present release:rc env: diff --git a/lerna.json b/lerna.json deleted file mode 100644 index 6f50e5584d..0000000000 --- a/lerna.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "useWorkspaces": true, - "version": "0.0.1-87d6a2c5d.0", - "command": { - "publish": { - "message": "chore: publish", - "createRelease": "github", - "conventionalCommits": true, - "verifyAccess": false - }, - "version": { - "allowBranch": ["master", "release/*"], - "forcePublish": true, - "ignore-changes": [".github/**", "docs/**"] - } - } -} diff --git a/package.json b/package.json index 3b82ef5c23..88d9c7f88e 100644 --- a/package.json +++ b/package.json @@ -39,17 +39,15 @@ "lint": "aegir run lint", "dep-check": "aegir run dep-check", "release": "run-s build npm:release docker:release", - "npm:release": "aegir publish from-package --no-push --no-private --yes", + "npm:release": "aegir run release", "docker:release": "run-s docker:release:*", "docker:release:build": "docker build . --no-cache --tag js-ipfs:latest --file ./Dockerfile.latest", "docker:release:tag-latest": "docker tag js-ipfs:latest docker.io/ipfs/js-ipfs:latest", "docker:release:tag-version": "docker tag js-ipfs:latest docker.io/ipfs/js-ipfs:v`npm show ipfs@latest version -q`", "docker:release:push-latest": "docker push ipfs/js-ipfs:latest", "docker:release:push-version": "docker push ipfs/js-ipfs:v`npm show ipfs@latest version -q`", - "release:rc": "run-s npm:rc:* docker:rc", - "npm:rc:version": "lerna version prerelease --preid `git rev-parse --short HEAD` --force-publish --no-push --yes", - "npm:rc:build": "npm run build", - "npm:rc:publish": "lerna publish from-package --no-push --no-private --dist-tag next --yes", + "release:rc": "run-s npm:rc docker:rc", + "npm:rc": "aegir run release-rc", "docker:rc": "run-s docker:rc:*", "docker:rc:build": "docker build . --no-cache --tag js-ipfs:next --file ./Dockerfile.next", "docker:rc:tag-next": "docker tag js-ipfs:next docker.io/ipfs/js-ipfs:next", @@ -58,8 +56,7 @@ "docker:rc:push-rc": "docker push ipfs/js-ipfs:v`npm show ipfs@next version -q`" }, "devDependencies": { - "aegir": "^37.9.0", - "lerna": "^6.4.0", + "aegir": "^37.11.0", "node-fetch": "npm:@achingbrain/node-fetch@^2.6.4", "npm-run-all": "^4.1.5" }, diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json index 3479d6457b..02b25ce20c 100644 --- a/packages/interface-ipfs-core/package.json +++ b/packages/interface-ipfs-core/package.json @@ -77,7 +77,7 @@ "@types/node": "^18.0.0", "@types/pako": "^2.0.0", "@types/readable-stream": "^2.3.13", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "blockstore-core": "^3.0.0", "copyfiles": "^2.4.1", "dag-jose": "^3.0.1", diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json index b30887b259..d57282a42e 100644 --- a/packages/ipfs-cli/package.json +++ b/packages/ipfs-cli/package.json @@ -105,7 +105,7 @@ "@types/progress": "^2.0.3", "@types/rimraf": "^3.0.1", "@types/yargs": "^17.0.10", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "ipfs-repo": "^17.0.0", "it-all": "^2.0.0", "it-first": "^2.0.0", diff --git a/packages/ipfs-client/package.json b/packages/ipfs-client/package.json index e477c8a7d4..df655f5dcf 100644 --- a/packages/ipfs-client/package.json +++ b/packages/ipfs-client/package.json @@ -66,6 +66,6 @@ "merge-options": "^3.0.4" }, "devDependencies": { - "aegir": "^37.9.0" + "aegir": "^37.11.0" } } diff --git a/packages/ipfs-core-config/package.json b/packages/ipfs-core-config/package.json index 551d8c587a..e31b7522a4 100644 --- a/packages/ipfs-core-config/package.json +++ b/packages/ipfs-core-config/package.json @@ -118,7 +118,7 @@ "uint8arrays": "^4.0.2" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "ipfs-core-utils": "^0.17.0" } } diff --git a/packages/ipfs-core-types/package.json b/packages/ipfs-core-types/package.json index 113ab9c5b1..f78f6f2c02 100644 --- a/packages/ipfs-core-types/package.json +++ b/packages/ipfs-core-types/package.json @@ -59,6 +59,6 @@ "multiformats": "^11.0.0" }, "devDependencies": { - "aegir": "^37.9.0" + "aegir": "^37.11.0" } } diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json index f7da0323be..b226897a8b 100644 --- a/packages/ipfs-core-utils/package.json +++ b/packages/ipfs-core-utils/package.json @@ -163,7 +163,7 @@ }, "devDependencies": { "@web-std/file": "^3.0.2", - "aegir": "^37.9.0" + "aegir": "^37.11.0" }, "browser": { "fs": false diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 0670afa160..6b300207a6 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -152,7 +152,7 @@ "@types/dlv": "^1.1.2", "@types/pako": "^2.0.0", "@types/rimraf": "^3.0.1", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "blockstore-datastore-adapter": "^5.0.0", "delay": "^5.0.0", "go-ipfs": "^0.12.0", diff --git a/packages/ipfs-daemon/package.json b/packages/ipfs-daemon/package.json index 25b5157a2f..e34d28607b 100644 --- a/packages/ipfs-daemon/package.json +++ b/packages/ipfs-daemon/package.json @@ -75,7 +75,7 @@ "libp2p": "next" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "node-fetch": "^3.2.3", "ws": "^8.5.0" }, diff --git a/packages/ipfs-grpc-client/package.json b/packages/ipfs-grpc-client/package.json index 3628dfa4d2..9af0f2d6d9 100644 --- a/packages/ipfs-grpc-client/package.json +++ b/packages/ipfs-grpc-client/package.json @@ -88,7 +88,7 @@ "ws": "^8.5.0" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "it-all": "^2.0.0", "protobufjs-cli": "^1.0.0", "sinon": "^15.0.1" diff --git a/packages/ipfs-grpc-protocol/package.json b/packages/ipfs-grpc-protocol/package.json index 8bd8b9d84a..61a7663823 100644 --- a/packages/ipfs-grpc-protocol/package.json +++ b/packages/ipfs-grpc-protocol/package.json @@ -60,7 +60,7 @@ "lint": "aegir lint" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "mkdirp": "^1.0.4", "protobufjs": "^7.0.0", "protobufjs-cli": "^1.0.0" diff --git a/packages/ipfs-grpc-server/package.json b/packages/ipfs-grpc-server/package.json index 5ffe08233c..8fea82fd12 100644 --- a/packages/ipfs-grpc-server/package.json +++ b/packages/ipfs-grpc-server/package.json @@ -83,7 +83,7 @@ }, "devDependencies": { "@types/ws": "^8.5.3", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "ipfs-core": "^0.17.0", "it-all": "^2.0.0", "it-drain": "^2.0.0", diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json index d125f608c7..c9c0308fd6 100644 --- a/packages/ipfs-http-client/package.json +++ b/packages/ipfs-http-client/package.json @@ -88,7 +88,7 @@ "uint8arrays": "^4.0.2" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "delay": "^5.0.0", "go-ipfs": "^0.12.0", "ipfsd-ctl": "^12.0.3", diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json index 06707928c8..399d4c23f7 100644 --- a/packages/ipfs-http-gateway/package.json +++ b/packages/ipfs-http-gateway/package.json @@ -85,7 +85,7 @@ "devDependencies": { "@types/hapi-pino": "^8.0.1", "@types/hapi__hapi": "^20.0.5", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "file-type": "^18.0.0", "sinon": "^15.0.1" } diff --git a/packages/ipfs-http-response/package.json b/packages/ipfs-http-response/package.json index f0f2c07eb7..0ccf1be840 100644 --- a/packages/ipfs-http-response/package.json +++ b/packages/ipfs-http-response/package.json @@ -79,7 +79,7 @@ "devDependencies": { "@types/ejs": "^3.1.0", "@types/mime-types": "^2.1.1", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "get-stream": "^6.0.0", "ipfs-core": "^0.17.0", "ipfsd-ctl": "^12.0.3", diff --git a/packages/ipfs-http-server/package.json b/packages/ipfs-http-server/package.json index be85bbc809..2a04338fde 100644 --- a/packages/ipfs-http-server/package.json +++ b/packages/ipfs-http-server/package.json @@ -103,7 +103,7 @@ "@types/hapi-pino": "^8.0.1", "@types/hapi__hapi": "^20.0.5", "@types/node": "^18.0.0", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "err-code": "^3.0.1", "form-data": "^4.0.0", "ipfs-http-client": "^59.0.0", diff --git a/packages/ipfs-message-port-client/package.json b/packages/ipfs-message-port-client/package.json index 0bfce00921..5c5b4ba982 100644 --- a/packages/ipfs-message-port-client/package.json +++ b/packages/ipfs-message-port-client/package.json @@ -73,7 +73,7 @@ "multiformats": "^11.0.0" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "interface-ipfs-core": "^0.157.0", "ipfs-core": "^0.17.0", "ipfs-message-port-server": "^0.14.0" diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json index 026548a215..d94258470a 100644 --- a/packages/ipfs-message-port-protocol/package.json +++ b/packages/ipfs-message-port-protocol/package.json @@ -91,7 +91,7 @@ "multiformats": "^11.0.0" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "uint8arrays": "^4.0.2" } } diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json index 273cac0e12..9e74d49ccf 100644 --- a/packages/ipfs-message-port-server/package.json +++ b/packages/ipfs-message-port-server/package.json @@ -97,7 +97,7 @@ "it-all": "^2.0.0" }, "devDependencies": { - "aegir": "^37.9.0", + "aegir": "^37.11.0", "multiformats": "^11.0.0" }, "browser": { diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json index 45df27a786..10d9f4f129 100644 --- a/packages/ipfs/package.json +++ b/packages/ipfs/package.json @@ -87,7 +87,7 @@ "@libp2p/websockets": "^5.0.0", "@types/semver": "^7.3.4", "@types/update-notifier": "^6.0.1", - "aegir": "^37.9.0", + "aegir": "^37.11.0", "cross-env": "^7.0.0", "go-ipfs": "^0.12.0", "interface-ipfs-core": "^0.157.0",