Browse Source

update version scripts

Yuki Takei 1 year ago
parent
commit
47f1e75e01

+ 1 - 1
.github/workflows/release-slackbot-proxy.yml

@@ -107,7 +107,7 @@ jobs:
 
     - name: Bump versions for next RC
       run: |
-        turbo run version --filter=@growi/slackbot-proxy -- --prerelease
+        turbo run version:prerelease --filter=@growi/slackbot-proxy
 
     - name: Retrieve information from package.json
       uses: myrotvorets/info-from-package-json-action@2.0.1

+ 3 - 3
.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
 
     - name: Bump versions
       run: |
-        turbo run version --filter=@growi/app -- --patch
+        turbo run version:patch --filter=@growi/app
         pnpm upgrade --scope=@growi
         sh ./apps/app/bin/github-actions/update-readme.sh
 
@@ -176,8 +176,8 @@ jobs:
 
     - name: Bump versions for next RC
       run: |
-        turbo run version --filter=@growi/app -- --prepatch
-        turbo run version --filter=@growi/slackbot-proxy -- --prepatch
+        turbo run version:prepatch --filter=@growi/app
+        turbo run version:prepatch --filter=@growi/slackbot-proxy
         pnpm upgrade --scope=@growi
 
     - name: Retrieve information from package.json

+ 5 - 1
apps/app/package.json

@@ -45,7 +45,11 @@
     "openapi:v3": "cross-env API_VERSION=3 pnpm run swagger-jsdoc -- \"src/server/routes/apiv3/**/*.js\" \"src/server/models/**/*.js\"",
     "openapi:v1": "cross-env API_VERSION=1 pnpm run swagger-jsdoc -- \"src/server/*/*.js\" \"src/server/models/**/*.js\"",
     "ts-node": "node -r ts-node/register/transpile-only -r tsconfig-paths/register -r dotenv-flow/config",
-    "version": "yarn version --no-git-tag-version --non-interactive --preid=RC"
+    "version:patch": "pnpm version patch",
+    "version:prerelease": "pnpm version prerelease --preid=RC",
+    "version:prepatch": "pnpm version prepatch --preid=RC",
+    "version:preminor": "pnpm version preminor --preid=RC",
+    "version:premajor": "pnpm version premajor --preid=RC"
   },
   "// comments for dependencies": {
     "@aws-skd/*": "fix version above 3.186.0 that is required by mongodb@4.16.0",

+ 18 - 2
apps/app/turbo.json

@@ -64,9 +64,25 @@
       "outputLogs": "new-only"
     },
 
-    "version": {
+    "version:patch": {
       "cache": false,
-      "dependsOn": ["^version", "//#version"]
+      "dependsOn": ["^version:patch", "//#version:patch"]
+    },
+    "version:prerelease": {
+      "cache": false,
+      "dependsOn": ["^version:prerelease", "//#version:prerelease"]
+    },
+    "version:prepatch": {
+      "cache": false,
+      "dependsOn": ["^version:prepatch", "//#version:prepatch"]
+    },
+    "version:preminor": {
+      "cache": false,
+      "dependsOn": ["^version:preminor", "//#version:preminor"]
+    },
+    "version:premajor": {
+      "cache": false,
+      "dependsOn": ["^version:premajor", "//#version:premajor"]
     }
 
   }

+ 6 - 2
apps/slackbot-proxy/package.json

@@ -20,8 +20,12 @@
     "lint:styles": "stylelint --allow-empty-input \"src/**/*.scss\" \"src/**/*.css\"",
     "lint:typecheck": "tspc",
     "lint": "run-p lint:*",
-    "version": "yarn version --no-git-tag-version --non-interactive --preid=slackbot-proxy",
-    "ts-node": "node -r ts-node/register/transpile-only -r tsconfig-paths/register -r dotenv-flow/config"
+    "ts-node": "node -r ts-node/register/transpile-only -r tsconfig-paths/register -r dotenv-flow/config",
+    "version:patch": "pnpm version patch",
+    "version:prerelease": "pnpm version prerelease --preid=slackbot-proxy",
+    "version:prepatch": "pnpm version prepatch --preid=slackbot-proxy",
+    "version:preminor": "pnpm version preminor --preid=slackbot-proxy",
+    "version:premajor": "pnpm version premajor --preid=slackbot-proxy"
   },
   "// comments for dependencies": {
     "@tsed/*": "v6.133.1 causes 'TypeError: Cannot read properties of undefined (reading 'prototype')' with `@Middleware()`",

+ 5 - 1
package.json

@@ -32,7 +32,11 @@
     "version-subpackages": "changeset version && pnpm run upgrade --scope=@growi",
     "release-subpackages": "turbo run build --filter @growi/core --filter @growi/pluginkit && changeset publish",
     "release-subpackages:snapshot": "turbo run build --filter @growi/core --filter @growi/pluginkit && changeset version --snapshot next && changeset publish --no-git-tag --snapshot --tag next",
-    "version": "yarn version --no-git-tag-version --non-interactive --preid=RC"
+    "version:patch": "pnpm version patch --no-git-tag-version",
+    "version:prerelease": "pnpm version prerelease --preid=RC --no-git-tag-version",
+    "version:prepatch": "pnpm version prepatch --preid=RC --no-git-tag-version",
+    "version:preminor": "pnpm version preminor --preid=RC --no-git-tag-version",
+    "version:premajor": "pnpm version premajor --preid=RC --no-git-tag-version"
   },
   "dependencies": {
     "cross-env": "^7.0.0",

+ 31 - 2
turbo.json

@@ -111,10 +111,39 @@
       "outputLogs": "new-only"
     },
 
-    "version": {
+    "version:patch": {
+      "dependsOn": ["//#version:patch"],
       "cache": false
     },
-    "//#version": {
+    "version:prerelease": {
+      "dependsOn": ["//#version:prerelease"],
+      "cache": false
+    },
+    "version:prepatch": {
+      "dependsOn": ["//#version:prepatch"],
+      "cache": false
+    },
+    "version:preminor": {
+      "dependsOn": ["//#version:preminor"],
+      "cache": false
+    },
+    "version:premajor": {
+      "dependsOn": ["//#version:premajor"],
+      "cache": false
+    },
+    "//#version:patch": {
+      "cache": false
+    },
+    "//#version:prerelease": {
+      "cache": false
+    },
+    "//#version:prepatch": {
+      "cache": false
+    },
+    "//#version:preminor": {
+      "cache": false
+    },
+    "//#version:premajor": {
       "cache": false
     }