You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@annotator.apache.org by ra...@apache.org on 2021/02/04 04:04:01 UTC
[incubator-annotator] branch master updated (2116a01 -> 2ce103f)
This is an automated email from the ASF dual-hosted git repository.
randall pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git.
from 2116a01 Do not push or tag automatically with lerna version
new 79c5cf2 Remove trailing comma in lerna.json
new 5c39325 Move --pre-dist-tag and --preid options to publish command settings
new 8accc93 Restore 0.1.0 version number
new 2387fa1 Fix double negative options in lerna.json
new 2ce103f Update publish command
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 2 +-
lerna.json | 11 +++++++----
package.json | 2 +-
packages/apache-annotator/package.json | 6 +++---
packages/dom/package.json | 4 ++--
packages/selector/package.json | 2 +-
6 files changed, 15 insertions(+), 12 deletions(-)
[incubator-annotator] 01/05: Remove trailing comma in lerna.json
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 79c5cf2e1981c3f453622cf23ce4d1325266218c
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Wed Feb 3 18:44:06 2021 -0800
Remove trailing comma in lerna.json
---
lerna.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lerna.json b/lerna.json
index de3c3e7..08e4097 100644
--- a/lerna.json
+++ b/lerna.json
@@ -9,7 +9,7 @@
"version": {
"noGitTagVersion": true,
"noPush": true,
- "preid": "dev",
+ "preid": "dev"
}
}
}
[incubator-annotator] 05/05: Update publish command
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 2ce103f17860cafec221524793f340add98bc25f
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Wed Feb 3 19:37:47 2021 -0800
Update publish command
Remove arguments already captured in lerna.json, move the canary
specifics to travi.yml, force all packages to publish for canary
publishes, and make all canary publishes depend on exact version
numbers of sibling packages.
---
.travis.yml | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8def488..8781f5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ deploy:
api_token:
secure: kjnHYXAsaqKFX9tYWRC4Zp/k9e8RQ79jVdjBNKlFExmPL5AvocYz/YeCbA/hZSnR02IjVHDAgWxVKCSDcIpDmhs0Bd7fOuyNmNm+ET0aFF6emtAMnw4RfmS0z0ZcQ8gDk3EhQ+c59VTe6s3TexBxXXUhEclKghF/iRFrcHtPBxmqTuo1rH9Nyp9Kk7QLFHMC2y1AWeTpjCdKA5ooxPb353oXRHS985sirnYkzUphTkMSFkK27hupbDpDSfiHYOZEZzGWUrgT7YYALqcck22Jqy7MdWhZgoAOFr0R26oz7wVssnvt2PNc8hFgK4oLBRwKloNjBKMBChRoJ257yGM2ak+z844xFx36u1x/MOS6NhC15UOdyZLKm6gyGFvNOUVuPmLpNhwh/0DkZ+N56FevOWoAT7+fg3Op67KnGKk3TZfEPKOixqF4w6TfhJCEQfEvZg/6618SfoxuI5SidBqweRNT9B+iTo [...]
cleanup: true
- run_script: canary
+ run_script: publish -- --canary --exact --force-publish "*" --yes minor
on:
branch: master
diff --git a/package.json b/package.json
index 0840fea..688fae6 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
"build:lib:esm": "cross-env BABEL_ENV=esm yarn build:lib --out-file-extension .mjs",
"build:lib:types": "tsc --build",
"build:misc": "lerna exec --parallel -- cp ../../DISCLAIMER-WIP ../../LICENSE ../../NOTICE ../../README.md .",
- "canary": "lerna publish --canary --dist-tag dev --no-git-tag-version --preid dev --yes",
"clean": "tsc --build --clean && lerna exec -- rimraf DISCLAIMER-WIP LICENSE NOTICE README.md lib",
"lint": "tsc --build && eslint .",
"prepare": "yarn run build:lib:types && lerna run prepare",
"prepublishOnly": "yarn run build",
+ "publish": "lerna publish",
"start": "yarn run web:server",
"test": "cross-env BABEL_ENV=test nyc mocha packages/**/*.test.ts",
"validate": "cross-env BABEL_ENV=test mocha test/**/*.test.ts",
[incubator-annotator] 03/05: Restore 0.1.0 version number
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 8accc934de3b98194bf9a415482e89b047d621dd
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Wed Feb 3 18:55:22 2021 -0800
Restore 0.1.0 version number
Bumping and pushing the version was a mistake.
---
lerna.json | 2 +-
packages/apache-annotator/package.json | 6 +++---
packages/dom/package.json | 4 ++--
packages/selector/package.json | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lerna.json b/lerna.json
index 99a306b..8da744d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
{
- "version": "0.2.0-dev.0",
+ "version": "0.1.0",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
diff --git a/packages/apache-annotator/package.json b/packages/apache-annotator/package.json
index d136228..4c29036 100644
--- a/packages/apache-annotator/package.json
+++ b/packages/apache-annotator/package.json
@@ -1,6 +1,6 @@
{
"name": "apache-annotator",
- "version": "0.2.0-dev.0",
+ "version": "0.1.0",
"description": "Apache Annotator provides annotation enabling code for browsers, servers, and humans.",
"homepage": "https://annotator.apache.org",
"repository": {
@@ -28,8 +28,8 @@
"module": "./lib/index.mjs",
"types": "./lib/index.d.ts",
"dependencies": {
- "@apache-annotator/dom": "^0.2.0-dev.0",
- "@apache-annotator/selector": "^0.2.0-dev.0",
+ "@apache-annotator/dom": "^0.1.0",
+ "@apache-annotator/selector": "^0.1.0",
"@babel/runtime-corejs3": "^7.12.5"
},
"engines": {
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 48b1edb..588b819 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
{
"name": "@apache-annotator/dom",
- "version": "0.2.0-dev.0",
+ "version": "0.1.0",
"description": "Utilities for annotation of the Document Object Model.",
"homepage": "https://annotator.apache.org",
"repository": {
@@ -21,7 +21,7 @@
"@babel/runtime-corejs3": "^7.12.5"
},
"devDependencies": {
- "@apache-annotator/selector": "^0.2.0-dev.0"
+ "@apache-annotator/selector": "^0.1.0"
},
"engines": {
"node": "^10 || ^11 || ^12 || >=13.7"
diff --git a/packages/selector/package.json b/packages/selector/package.json
index e9864a3..d7f230e 100644
--- a/packages/selector/package.json
+++ b/packages/selector/package.json
@@ -1,6 +1,6 @@
{
"name": "@apache-annotator/selector",
- "version": "0.2.0-dev.0",
+ "version": "0.1.0",
"description": "Web Annotation selector for engine.",
"homepage": "https://annotator.apache.org",
"repository": {
[incubator-annotator] 04/05: Fix double negative options in
lerna.json
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 2387fa1ac5def5b45edadf0f42daf57d2ccc1684
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Wed Feb 3 19:24:48 2021 -0800
Fix double negative options in lerna.json
---
lerna.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lerna.json b/lerna.json
index 8da744d..72d9de3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -11,8 +11,8 @@
"preid": "dev"
},
"version": {
- "noGitTagVersion": true,
- "noPush": true
+ "gitTagVersion": false,
+ "push": false
}
}
}
[incubator-annotator] 02/05: Move --pre-dist-tag and --preid
options to publish command settings
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
randall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-annotator.git
commit 5c39325cd3031540fe90616404690cb9f86cfdfe
Author: Randall Leeds <ra...@apache.org>
AuthorDate: Wed Feb 3 18:52:44 2021 -0800
Move --pre-dist-tag and --preid options to publish command settings
---
lerna.json | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lerna.json b/lerna.json
index 08e4097..99a306b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -6,10 +6,13 @@
"packages/*"
],
"command": {
+ "publish": {
+ "preDistTag": "dev",
+ "preid": "dev"
+ },
"version": {
"noGitTagVersion": true,
- "noPush": true,
- "preid": "dev"
+ "noPush": true
}
}
}