Merge pull request #292 from liferay/wincent/prepare-for-toolkit-rele…

…ases chore(js-themes-toolkit): make final tweaks for monorepo releases
liferay · Dec 14, 2020 · 83b66d3 · 83b66d3
2 parents c8d3011 + 7ea5fdc
commit 83b66d3
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/maintenance/projects/js-themes-toolkit-v8-x/.yarnrc b/maintenance/projects/js-themes-toolkit-v8-x/.yarnrc
@@ -1 +1,9 @@
 --publish.tag maintenance
+
+# We don't actually use `yarn version` to publish this project, but we still
+# specify the desired tag format here so that `@liferay/changelog-generator` can
+# pick it up.
+#
+# Note that prefix is based on the directory name so that
+# `@liferay/changelog-generator` distinguish it from the v9-x series.
+version-tag-prefix "js-themes-toolkit-v8-x/v"
diff --git a/maintenance/projects/js-themes-toolkit-v8-x/CONTRIBUTING.md b/maintenance/projects/js-themes-toolkit-v8-x/CONTRIBUTING.md
@@ -75,8 +75,8 @@ yarn ci
 
 # Prepare and push final commit:
 git add -A
-git commit -m "chore: prepare $VERSION release"
-git tag liferay-js-themes-toolkit/v$VERSION -m liferay-js-themes-toolkit/v$VERSION
+git commit -m "chore(js-themes-toolkit): prepare $VERSION release"
+git tag js-themes-toolkit-v8-x/v$VERSION -m liferay-js-themes-toolkit/v$VERSION
 git push upstream master --follow-tags
 ```
 

diff --git a/maintenance/projects/js-themes-toolkit-v8-x/package.json b/maintenance/projects/js-themes-toolkit-v8-x/package.json
@@ -28,8 +28,8 @@
 		"ansi-colors": "3.2.4"
 	},
 	"scripts": {
-		"changelog": "npx liferay-changelog-generator",
-		"changelog:regenerate": "npx liferay-changelog-generator --regenerate",
+		"changelog": "node ../../../projects/npm-tools/packages/changelog-generator/bin/liferay-changelog-generator.js",
+		"changelog:regenerate": "node ../../../projects/npm-tools/packages/changelog-generator/bin/liferay-changelog-generator.js --regenerate",
 		"ci": "yarn format:check && yarn lint && yarn test",
 		"format": "cd ../../.. && yarn format",
 		"format:check": "cd ../../.. && yarn format:check",

diff --git a/maintenance/projects/js-themes-toolkit-v9-x/.yarnrc b/maintenance/projects/js-themes-toolkit-v9-x/.yarnrc
@@ -1 +1,9 @@
 --publish.tag maintenance
+
+# We don't actually use `yarn version` to publish this project, but we still
+# specify the desired tag format here so that `@liferay/changelog-generator` can
+# pick it up.
+#
+# Note that prefix is based on the directory name so that
+# `@liferay/changelog-generator` distinguish it from the v8-x series.
+version-tag-prefix "js-themes-toolkit-v9-x/v"
diff --git a/maintenance/projects/js-themes-toolkit-v9-x/CONTRIBUTING.md b/maintenance/projects/js-themes-toolkit-v9-x/CONTRIBUTING.md
@@ -63,8 +63,8 @@ yarn ci
 
 # Prepare and push final commit:
 git add -A
-git commit -m "chore: prepare $VERSION release"
-git tag liferay-js-themes-toolkit/v$VERSION -m liferay-js-themes-toolkit/v$VERSION
+git commit -m "chore(js-themes-toolkit): prepare $VERSION release"
+git tag js-themes-toolkit-v9-x/v$VERSION -m liferay-js-themes-toolkit/v$VERSION
 git push upstream master --follow-tags
 ```
 

diff --git a/maintenance/projects/js-themes-toolkit-v9-x/package.json b/maintenance/projects/js-themes-toolkit-v9-x/package.json
@@ -40,8 +40,8 @@
 		"ansi-colors": "3.2.4"
 	},
 	"scripts": {
-		"changelog": "npx liferay-changelog-generator",
-		"changelog:regenerate": "npx liferay-changelog-generator --regenerate",
+		"changelog": "node ../../../projects/npm-tools/packages/changelog-generator/bin/liferay-changelog-generator.js",
+		"changelog:regenerate": "node ../../../projects/npm-tools/packages/changelog-generator/bin/liferay-changelog-generator.js --regenerate",
 		"ci": "yarn format:check && yarn lint && yarn test",
 		"format": "cd ../../.. && yarn format",
 		"format:check": "cd ../../.. && yarn format:check",