Explorar el Código

Merge branch 'master' into imprv/load-template-plugins-on-server

Yuki Takei hace 2 años
padre
commit
05261247de
Se han modificado 2 ficheros con 7 adiciones y 5 borrados
  1. 3 2
      package.json
  2. 4 3
      turbo.json

+ 3 - 2
package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "6.1.4-RC.0",
+  "version": "6.1.5-RC.0",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",
@@ -39,7 +39,8 @@
     "slackbot-proxy:build": "turbo run build --filter @growi/slackbot-proxy",
     "slackbot-proxy:server": "cd apps/slackbot-proxy && yarn start:prod",
     "bump-versions:patch": "turbo run version -- --patch",
-    "bump-versions:rc": "turbo run version -- --prepatch --preid=RC"
+    "bump-versions:rc": "turbo run version -- --prepatch --preid=RC",
+    "version": "yarn version --no-git-tag-version"
   },
   "dependencies": {
     "cross-env": "^7.0.0",

+ 4 - 3
turbo.json

@@ -172,9 +172,10 @@
       "outputMode": "new-only"
     },
     "version": {
-      "outputMode": "new-only",
-      "outputs": ["package.json"],
-      "inputs": ["package.json"]
+      "cache": false
+    },
+    "//#version": {
+      "cache": false
     }
 
   }