Explorar o código

Merge branch 'cherry-pick-3f7393c9' into 'release'

Merge branch 'fix/api_v' into 'wrdp'

See merge request o2oa/o2oa!2840
胡起 %!s(int64=5) %!d(string=hai) anos
pai
achega
66f58dc880
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      gulpfile.js
  2. 1 1
      package.json

+ 1 - 1
gulpfile.js

@@ -835,7 +835,7 @@ function build_web_api() {
 
 function build_doc(){
     return getGitV().then(function(arr){
-        return (shell.task('jsdoc -c o2web/jsdoc.conf.json -q version=('+arr[0]+'-'+arr[1]+')'))();
+        return (shell.task('jsdoc -c o2web/jsdoc.conf.json -q version=\'('+arr[0]+'-'+arr[1]+')\''))();
     });
 }
 exports.build_api = gulp.series(build_doc, build_web_api);

+ 1 - 1
package.json

@@ -17,7 +17,7 @@
                 "build_web": "npm run build_api_version && gulp build_web",
                 "build_api_version": "jsdoc -c o2web/jsdoc.conf.json -q version=${VAPI}",
                 "build_api": "jsdoc -c o2web/jsdoc.conf.json -q version=",
-                "build_parallel": "npm run build_server && npm run build_api &&  npm run build_web",
+                "build_parallel": "npm run build_server && npm run build_web",
                 "deploy": "gulp deploy",
                 "deploy:win": "gulp deploy --e windows",
                 "deploy:linux": "gulp deploy --e linux",